merge in oc-dr1-release history after reset to master
tree: 51b327db1b7292b653079a88ac5b928ab83c6692
  1. src/
  2. Android.mk
  3. AndroidManifest.xml
  4. proguard.flags