merge in lmp-mr1-release history after reset to lmp-mr1-dev
tree: 6ed35106743284ef68a4005f625d101da6dd7721
  1. res/
  2. src/
  3. proguard.flags