tree 9cad96e98cd381cf6cadbbd3f78d2d7fc8e0ff6e
parent 360fbb16b78dc46bf0ab88440b5f26fb84c31be3
parent 9c2145d29712989ab925e1d8702f631ace085f26
author Tao Bao <tbao@google.com> 1534175465 -0700
committer android-build-merger <android-build-merger@google.com> 1534175465 -0700

Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 am: e5734c014f
am: 9c2145d297

Change-Id: I584a1377a809bf730773e824f818fedb9fb75aa5