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