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