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