commit 2b87fe0e09066d38e37b2632a9dcfa715afe3223
author Chet Haase <chet@google.com> Tue Jan 19 17:33:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 19 17:33:14 2016 +0000
tree 8c9ea02c3c2509c4057402abd945e07e788fa245
parent 663d09ab4273f3e2c68bfaa72d4973f58e5cc023
parent 7d97a72da2d7f78b16ca0aff206572f58bd0cce1

Merge "Add AutoCancelTest back to framework tests"

core/tests/coretests/src/android/animation/AutoCancelTest.java

diff --git a/core/tests/coretests/src/android/animation/AutoCancelTest.java b/core/tests/coretests/src/android/animation/AutoCancelTest.java
index 5810818..b1f88db 100644
--- a/core/tests/coretests/src/android/animation/AutoCancelTest.java
+++ b/core/tests/coretests/src/android/animation/AutoCancelTest.java
@@ -18,12 +18,10 @@
 import android.os.Handler;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
 
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
-@Suppress  // Failing
 public class AutoCancelTest extends ActivityInstrumentationTestCase2<BasicAnimatorActivity> {
 
     boolean mAnimX1Canceled = false;