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