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