tree c89aa827170c242aa2c836bc64b0de57f91207d1
parent c0c9bd075a0f98ac0348f00e130f74c90d318e4a
parent 0eeaa4643c75b4b099212d8e1a77a6063e5cb169
author Kirill Grouchnikov <kirillg@google.com> 1494897660 +0000
committer android-build-merger <android-build-merger@google.com> 1494897660 +0000

Merge "Tweak test app makefile with extra resources" into oc-dev am: 2b1df4ec14
am: 0eeaa4643c

Change-Id: Ib1ef7ab4481cf24a5f9a4eb8c03963355d28de5b