merge in release branch changes (no-op).
tree: 5678b84626d7cbb922b58e4c27b010ca5bebef0e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags