Android O MR1 Preview 2 (OPP6.171019.012)
Revert "Tweak app makefile with extra resources"
am: 4040c23203

Change-Id: I5a05addb638b4e17b121a0d7c41044c6b620b509
tree: d99cc3c21bffb96eac44bb3d72c69ea88d49abae
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml