OSDN Git Service

Merge "Tweak test app makefile with extra resources" into oc-dev
authorKirill Grouchnikov <kirillg@google.com>
Mon, 15 May 2017 23:26:16 +0000 (23:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 May 2017 23:26:16 +0000 (23:26 +0000)
commit0eeaa4643c75b4b099212d8e1a77a6063e5cb169
tree700227a7709c3f4f91e2837d4f595cefa17c0ed0
parent4e99819ba60e0c284b3ba47de274f7e29d0e3081
parent2b1df4ec14ae8cced2bd74cb60d0f2751562d02d
Merge "Tweak test app makefile with extra resources" into oc-dev
am: 2b1df4ec14

Change-Id: I861ebd781bec4c41582c9a11f9cb79fb8982be18