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