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