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