| commit | 76acdadaf747a7c9a54a38e9739f7d573d48c294 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri May 31 03:11:22 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri May 31 03:11:22 2019 +0000 |
| tree | bab2f5411e3e4c2a7a14333cf9e450a4707f27a5 | |
| parent | a81760510df18c4dd01b0a1061b51e4003fec94e [diff] | |
| parent | 2f9a7c8ab0c2495d8c84c48e1838b2abbcbb2cbb [diff] |
Merge "Make test_options.timeout an int64"
diff --git a/java/robolectric.go b/java/robolectric.go index 26f1e9d..b87ee0d 100644 --- a/java/robolectric.go +++ b/java/robolectric.go
@@ -39,7 +39,7 @@ Test_options struct { // Timeout in seconds when running the tests. - Timeout *string + Timeout *int64 } }