[automerger skipped] DO NOT MERGE am: c03cfd5534  -s ours
am: 830e33de3e  -s ours

Change-Id: Icf32dcae08217cc8a7da2eaad963598ff31f96b4
tree: 4624ea73151b8edae258f82fc4f9790bfd0c2f70
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/