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