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

Change-Id: I967f12a05487cbb3ad482712258a7a45a6fe5667
tree: 2c3c8270dab90b52f181e131956890f39c9299f8
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml