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

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