merge in lmp-release history after reset to 95269806cbd0f707f22be0a300e35267c3ae97bd
tree: 67610f74bc3608cb75af7df307d23265d7d3d8c8
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml