tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent 776651cc5b2d4db207139c27664e5a021b6c5273
parent ab526b124623052c6db1a5bcb02bca66e73509c4
author Tao Bao <tbao@google.com> 1477440128 +0000
committer android-build-merger <android-build-merger@google.com> 1477440128 +0000

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

Change-Id: I5ce8de6c1bb15f30570428ee106b83356ef3bd90