tree 96a6c47d7b6a2a1f667a3f69fdb43eb6b905a350
parent 770ab63945b5191bdd757fbad9c9676ea4c53392
parent 08d3e838229d13008816cdccd33a342edfd72a1c
author Tao Bao <tbao@google.com> 1522718158 -0700
committer android-build-merger <android-build-merger@google.com> 1522718158 -0700

Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 am: 8028dc1ce4
am: 08d3e83822

Change-Id: I53552e36aeb5fae30ff774d6e19d527e2c6000dc