Merge "Merge "Make MediaStyle#setRemotePlayback public" into udc-dev am: 506535c339 am: 9dae55eb96"
diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java
index 322d23b..21ba403 100644
--- a/core/java/android/animation/Animator.java
+++ b/core/java/android/animation/Animator.java
@@ -69,7 +69,7 @@
* backing field for backgroundPauseDelay property. This could be simply a hardcoded
* value in AnimationHandler, but it is useful to be able to change the value in tests.
*/
- private static long sBackgroundPauseDelay = 10000;
+ private static long sBackgroundPauseDelay = 1000;
/**
* A cache of the values in a list. Used so that when calling the list, we have a copy