merge in oc-release history after reset to master
tree: 0c0263f40a2f6a94f5558e455a8e40630841a1ae
  1. java/
  2. Android.mk
  3. copy.bara.sky
  4. manifest.txt