merge in lmp-release history after reset to fa143d53a4aa93c51261a65372edcc8a5c8910b3
tree: 159db35e048418ad9d01b40c6f1375e7800821ca
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml