merge in lmp-release history after reset to 1d065428ecfd8fd8f73f37625713b2a8522b0867
tree: 577ef601acc3da3bc032c9a3e1517f0ea1b56e93
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml