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

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