Merge commit 'aea16b8e4a59d9dd2ebbb4274566212e4bf1f775' into HEAD
Change-Id: I5f167c5249cf660c2b277090d075b4b41f594025
tree: 8f215989c9450adc16c742eedbcc5cd11a7490c7
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg