Merge "Tweak app makefile with extra resources" into oc-dev
am: e724c7b637

Change-Id: I63a0ccc8cb1fa4908ff2c5b6f9d6a968079e12fd
tree: de4ef169350a71f1ed6c1e62b532d383a829f55b
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE