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