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