Merge "Revert "Tweak app makefile with extra resources"" into oc-dev
tree: 9910fb95c6fdb10b06ee8be02a3374d2882005b9
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE