tree 9cad96e98cd381cf6cadbbd3f78d2d7fc8e0ff6e
parent eee4b3a61b42f4b5c89c3b672971b2e16f24dd9c
parent da7bf54cd8228e667c8c512524f2caf8976e0602
author Tao Bao <tbao@google.com> 1534175701 -0700
committer android-build-merger <android-build-merger@google.com> 1534175701 -0700

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

Change-Id: I6a964a5f3d1dcac23b456f38abb58a404ec29648