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

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