merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev
tree: 905c95d932a3c6713b07309e549d32dcd698ab92
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml