Automated import from //branches/master/...@140414,140414
diff --git a/libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java b/libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
index eed8d3a..7102c14 100644
--- a/libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
+++ b/libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
@@ -1044,9 +1044,11 @@
 
         try {
             t.start();
-            Thread.sleep(SHORT_DELAY_MS);
+            // BEGIN android-changed
+            Thread.sleep(SMALL_DELAY_MS); // SHORT_DELAY_MS was flaky on Android
             t.interrupt();
-            t.join(SHORT_DELAY_MS);
+            t.join(SMALL_DELAY_MS);       // SHORT_DELAY_MS was flaky on Android
+            // END android-changed
             assertFalse(t.isAlive());
         }
         catch (Exception ex) {