[automerger skipped] DO NOT MERGE am: 71c274c6b9  -s ours
am: d74296220b -s ours
am skip reason: subject contains skip directive

Change-Id: I2bacbcfb6562c6d78ed3699c102210ee335e98d8
tree: 083eb074d487e23c247da13aed57abeb4d4f8cb9
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags