Commit dc67600f authored May 30, 2019 by Colin Cross Committed by android-build-merger May 30, 2019

Merge "Make test_options.timeout an int64" am: c56651b3 am: 001b1c55 am: 2d7cf1d9

am: cde28793

Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca

tests/robotests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ android_robolectric_test {
		instrumentation_for: "SettingsRoboTestStub",

		test_options: {
		timeout: "36000",
		timeout: 36000,
		},

		coverage_libs: [