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