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