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