merge in oc-release history after reset to 904cf685507edf016af0068fb2b5c2499b146e54
tree: 87e7c607c506f3a43446cc1bcedf0e6aa4a6a5b4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags