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