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