merge in oc-release history after reset to master
tree: 2f5168c8f0cd6ab80b19bd604395c9d9f7c7fe2f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml