AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests
  Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
diff --git a/tests/CoreTests/android/core/LocaleTest.java b/tests/CoreTests/android/core/LocaleTest.java
index 88b0c06..72489c6 100644
--- a/tests/CoreTests/android/core/LocaleTest.java
+++ b/tests/CoreTests/android/core/LocaleTest.java
@@ -28,6 +28,7 @@
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.Suppress;
 
 /**
  * Test some locale-dependent stuff for Android. This test mainly ensures that
@@ -125,9 +126,9 @@
     }
     */
 
-    // Regression test for 1118570: Create test cases for tracking ICU config
-    // changes. This one makes sure we have all necessary locales installed.
-    @MediumTest
+    // This one makes sure we have all necessary locales installed.
+    // Suppress this flaky test for now.
+    @Suppress
     public void testICULocales() {
         String[] locales = new String[] {
                 // List of locales currently required for Android.