Merge "Make test_options.timeout an int64" am: 9a2d64872b am: 9b4f268106

am: 4a420d368f

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

View File

@@ -36,7 +36,7 @@ android_robolectric_test {
instrumentation_for: "SettingsLibShell", instrumentation_for: "SettingsLibShell",
coverage_libs: ["SettingsLib"], coverage_libs: ["SettingsLib"],
test_options: { test_options: {
timeout: "36000", timeout: 36000,
}, },
} }