merge in oc-dr1-release history after reset to fbb0b0e70fc109d409f7442ff08e84e0217cd4c8
tree: 7ca185258c3284274b27ccdc691dc5fbf4d94e68
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml