tree 01a0d3c321d48b0a109ace335bb2911d7d8dc7b1
parent ba53452938f6cc9405887a88181fceb8cbcc59a2
parent 86487d68557865faae5c612512764b1fb3529b93
author Tao Bao <tbao@google.com> 1477440429 +0000
committer android-build-merger <android-build-merger@google.com> 1477440429 +0000

Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246
am: 86487d6855

Change-Id: If5ee190b0a1bc65bc048fadf77346405452adedf