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