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