merge in lmp-mr1-release history after reset to aefe4c32106678e00dce07bcb9c7aad489f47743
tree: 5944c3dd80fe436a01c401e165f62403593b66bd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags