tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent 6d9f8993b0081645ee09c2d9364c110970c0cc30
parent 8f9672c0db3259e8ce9fb9fb1ee8971bb2eb8638
author Tao Bao <tbao@google.com> 1477439888 +0000
committer android-build-merger <android-build-merger@google.com> 1477439888 +0000

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

Change-Id: I4d7dc8bf4a2bda409d02bfa458d365668f3f1576