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