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