tree 9cad96e98cd381cf6cadbbd3f78d2d7fc8e0ff6e
parent 1303267b3204998d10122b6b9ba94d436b9e3799
parent e5734c014fbd71bca46e83b96c88949229f19d24
author Tao Bao <tbao@google.com> 1534175231 -0700
committer android-build-merger <android-build-merger@google.com> 1534175231 -0700

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

Change-Id: Ia13c3f4b0940f2089f747d6cf23cc691889f0b25