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