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