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