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