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

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