merge in lmp-mr1-release history after reset to a6b72c46163e5fabe74415d2bfbf877a3941150c
tree: 4dd53682c26f8d16d95cac95a1c44a08e17f4a08
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags