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