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