OSDN Git Service

Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a
authorColin Cross <ccross@android.com>
Thu, 26 Jan 2017 18:59:42 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 18:59:42 +0000 (18:59 +0000)
commita2cd7c5c0c0ce08426d57fac2f3a7cee63f3a9c9
tree9116132cd66c9a540b84e8a03c8f5675d85af858
parentc0e5c66110a9c7898dfe154acd43c476ce56bb38
parentb1a2bd97b329c553706b166d5d3cdd38996a348b
Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a
am: b1a2bd97b3

Change-Id: I6af0e1f0d5ea6697605fc946354da8f92d9f4d39