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