[automerger skipped] DO NOT MERGE
am: 1e1b0fc173  -s ours

Change-Id: Ibec8c040af6f705d52d728deb131c50ff164c9bd
tree: 4f0c569e3e6a47cda3aa3a10dfceb7fb68668dfe
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS