merge in mnc-dr-release history after reset to mnc-dr-dev
tree: 5fbc37e1cace9f0a0955083070c7de14364c3e98
  1. res/
  2. src/
  3. tests/
  4. proguard.flags