merge in master-release history after reset to 50386c5701a0bc08e7a851cd92f44e985a4b2cca
tree: 60a7907408abfacbf7c1d182e7a31996787199e8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml