am e5c4d0a7: am f424208a: Merge "Increase Holo long timeout to 6 seconds" into jb-dev
* commit 'e5c4d0a70f08d81d1a7020656594b1a9ca202f31':
Increase Holo long timeout to 6 seconds
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
index aa161a2..3a0e2af 100644
--- a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
+++ b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
@@ -52,7 +52,7 @@
private static final int SHORT_TIMEOUT_MS = 500;
/** Longer timeout for widgets that have one-time animations. */
- private static final int LONG_TIMEOUT_MS = 3000;
+ private static final int LONG_TIMEOUT_MS = 6000;
static class LayoutInfo {
private final int mDisplayName;