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