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