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