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

Change-Id: Id496a1488eccb7d8e15475b1a7a290a7f5e692b0
tree: f10fc5bb49261f931e80d6c5fd6f104e70ccd2da
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. PREUPLOAD.cfg