merge in master-release history after reset to 6020ea4ec166f2a168c8ecf73a9a605169838da1
tree: 497239971783bf35734d43678be945115e044934
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags