[automerger skipped] DO NOT MERGE am: e6c275ee60  -s ours
am: 9cc0ec0633 -s ours
am skip reason: subject contains skip directive

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