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

Change-Id: I46e9acd6efc5f4f1f30db014f95b52dfb7ceafb1
tree: 276700c41e6024497f1edb881fa936f39860b5e4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml