merge in lmp-mr1-nova-release history after reset to lmp-mr1-release
tree: 09f394d8e54ad74072feb802e898667fafe64645
  1. proguard.flags
  2. res/
  3. src/