tree 69b65fe930928468ae868297cca84116c1b74a9c
parent c57430a61eab62e88372f386c75989dab6332608
parent fb63fc2c6b774b54957466729f17108ffcf22c4b
author Kirill Grouchnikov <kirillg@google.com> 1494899591 +0000
committer android-build-merger <android-build-merger@google.com> 1494899591 +0000

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

Change-Id: I88573a3020e6394f819245dea10ad741b6ccb81a