Merge "Make test_options.timeout an int64"

am: 76acdadaf7 Change-Id: I8ca70f00056555feb95434a7ece28e1bb6604e2d
2019-05-30 20:18:58 -07:00
parent a4fe1bccc9 76acdadaf7
commit acb00184c3
1 changed files with 1 additions and 1 deletions
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -39,7 +39,7 @@ type robolectricProperties struct {

 	Test_options struct {
 		// Timeout in seconds when running the tests.
-		Timeout *string
+		Timeout *int64
 	}
 }