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