OSDN Git Service

Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
authorColin Cross <ccross@android.com>
Fri, 31 May 2019 03:28:58 +0000 (20:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 May 2019 03:28:58 +0000 (20:28 -0700)
commitcde28793cd35a100a52c37ee011f019925b7e876
tree99e6a96da24a0b1476f905a3d5aa3018fc5be504
parentc6f766ec2bcf4e97deef7c3b331e85151574e039
parent2d7cf1d9242a690ca112528073dba1215da96f7d
Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
am: 2d7cf1d924

Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed