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

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