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