merge in master-release history after reset to 0be366f2fa7561558f6e6d40739f05533f4bbffe
tree: 3c3f38ad65f7f3ac1482a392df408628a6c7e466
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml