merge in oc-release history after reset to oc-dev
tree: 7fd8e292fa407c8a5a6d888f373eb5f661d773bc
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle