commit a1aedd2108b2ec6e580e90052327b2643297349b
author Seigo Nonaka <nona@google.com> Tue Sep 04 02:50:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 02:50:29 2018 -0700
tree 66bfdf3734fd192f32b7ec2d8bab416196a350ae
parent cd6e61cd538dec09a65f4a175c54b2fcd69ff0f7
parent 886f1488ea4f743b416fce1883d697ecf4cce148

Merge "Disable tests failing with ICU62" am: cc11cf2ef2
am: 886f1488ea

Change-Id: I82ec86c5187639f8b3ac14d9fc4bd77aed1befb1

core/tests/coretests/src/android/text/method/ForwardDeleteTest.java

diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
index 15dbbc8..c98e646 100644
--- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
+++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
@@ -20,6 +20,7 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.Suppress;
 import android.text.InputType;
 import android.util.KeyUtils;
 import android.view.KeyEvent;
@@ -238,6 +239,7 @@
     }
 
     @Test
+    @Suppress
     public void testEmojiModifier() {
         EditorState state = new EditorState();
 
@@ -267,6 +269,7 @@
     }
 
     @Test
+    @Suppress
     public void testMixedEdgeCases() {
         EditorState state = new EditorState();