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