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