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

am: 2d7cf1d924 Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed
2019-05-30 20:28:58 -07:00
parent c6f766ec2b 2d7cf1d924
commit cde28793cd
1 changed files with 1 additions and 1 deletions
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -66,7 +66,7 @@ android_robolectric_test {
    instrumentation_for: "SettingsRoboTestStub",

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

    coverage_libs: [