Merge "Manually integrate upstream oc-dr1-dev changes."
tree: 9ea169a73c0299325e0d5cd54323c79370cfeb7f
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE