tree 78a9f0a5eef102036e1b1ee31835c9af5f63f4c7
parent 322d0004ba05e2502ae68d1dd710e545a6f28e05
parent 9e381e6f86be1c581f8e0a49be1857c819270849
author Colin Cross <ccross@android.com> 1485457483 +0000
committer android-build-merger <android-build-merger@google.com> 1485457483 +0000

Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a am: b1a2bd97b3 am: a2cd7c5c0c
am: 9e381e6f86

Change-Id: I6d7a02e1ab7e1b23bfd8ee939003e3cb9b16ed53