[automerger skipped] DO NOT MERGE am: c03cfd5534  -s ours
am: 830e33de3e -s ours
am skip reason: subject contains skip directive

Change-Id: Ib901694eeff83dedff2baa28bd92eeb04421d109
tree: 5099501f3857adaf16c0f75220a5f6c9938c3533
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml