Commits
Tsu Chiang Chuang authored and Android Git Automerger committed dad8235dcaeM
am 6cc5d7fc: Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev * commit '6cc5d7fc0b23305fb7a3216b814d96d1ebab76d7': fix broken user build: do not throw an error when in user flavor.
Showing diff to4990a850ff0