[automerger skipped] DO NOT MERGE am: 71c274c6b9  -s ours
am: d74296220b  -s ours

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