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