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