merge in master-release history after reset to 4037ae44d2e5b97c6abb89be0882418576d9db37
tree: 152162e7a0e8d6718b94288d2cadc1d406bfeb3d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags