Merge commit '6f0fcf4143f3da765bdb95cc351aff66916fb24d' into HEAD
Change-Id: Iacbb14f0e73c39de963e59a1b61330fc5db4582c
tree: 2e77e435fa19de9e27f8b4fffb51a7de47e5c5ff
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS