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