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