[automerger skipped] DO NOT MERGE
am: 3baaa048af  -s ours

Change-Id: I620cdbdfe1520ba45723cb9d6bc132d19bf5338e
tree: a07f0db0f5f546b61f6e567c0b6ba900e23cdc54
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. CleanSpec.mk
  5. NOTICE
  6. PREUPLOAD.cfg