tree 0b373fbcaba1120f0f44aedefcf6a162c886e423
parent 63db3256d39d5a93ae7929e173098f7e79bba9d1
parent acb00184c37d211ac25b4639597f6bae3c33ced3
author Colin Cross <ccross@android.com> 1559273046 -0700
committer android-build-merger <android-build-merger@google.com> 1559273046 -0700

Merge "Make test_options.timeout an int64" am: 76acdadaf7
am: acb00184c3

Change-Id: Id7a50b086ce755877e2656c98b5be8896b456bfd