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