OSDN Git Service

Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a am: b1a2bd97b3
authorColin Cross <ccross@android.com>
Thu, 26 Jan 2017 19:02:13 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 19:02:13 +0000 (19:02 +0000)
commit9e381e6f86be1c581f8e0a49be1857c819270849
tree9116132cd66c9a540b84e8a03c8f5675d85af858
parentdf5efb7e7219bc6be18ec688890553b13d9b2084
parenta2cd7c5c0c0ce08426d57fac2f3a7cee63f3a9c9
Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a am: b1a2bd97b3
am: a2cd7c5c0c

Change-Id: I7c0e6cc298165d1dc5e25014d73e850b9f7fe201