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