tree 700227a7709c3f4f91e2837d4f595cefa17c0ed0
parent 4e99819ba60e0c284b3ba47de274f7e29d0e3081
parent 2b1df4ec14ae8cced2bd74cb60d0f2751562d02d
author Kirill Grouchnikov <kirillg@google.com> 1494890776 +0000
committer android-build-merger <android-build-merger@google.com> 1494890776 +0000

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

Change-Id: I861ebd781bec4c41582c9a11f9cb79fb8982be18