Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d am: 2d7cf1d924

am: cde28793cd

Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca
This commit is contained in:
Colin Cross
2019-05-30 20:46:28 -07:00
committed by android-build-merger

View File

@@ -66,7 +66,7 @@ android_robolectric_test {
instrumentation_for: "SettingsRoboTestStub", instrumentation_for: "SettingsRoboTestStub",
test_options: { test_options: {
timeout: "36000", timeout: 36000,
}, },
coverage_libs: [ coverage_libs: [