Snap for 11273583 from 76706c682d4cabaa5ea2bc72f7365e8b2b1fd6c0 to mainline-ipsec-release

Change-Id: Ic75f6ded54100afa44ba48324a365de5e54f1e77
diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java b/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
index 6b96f13..63ea3f0 100644
--- a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
+++ b/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
@@ -42,7 +42,7 @@
     }
 
     @LargeTest
-    @Test(timeout=600000)
+    @Test(timeout=1020000)
     public void mockALot() {
         for (int i = 0; i < NUM_TESTS; i++) {
             if (i % 1024 == 0) {