commit c99e433d6e12b17b923305a7513dc9d50ad9d50e
author The Android Automerger <android-build@google.com> Wed Feb 04 06:10:20 2015 -0800
committer The Android Automerger <android-build@google.com> Wed Feb 04 06:10:20 2015 -0800
tree 048d3330f88344be27f77b001b84f44346bc8a0f
parent ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad
parent e2f1dd5ec826180d190c9c3c2d40ecb1b4451321

merge in lmp-mr1-release history after reset to lmp-mr1-dev

luni/src/test/java/libcore/java/util/TimeZoneTest.java

diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index c40c974..caf635c 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -255,14 +255,6 @@
         assertEquals("", failures.toString());
     }
 
-    public void testSantiago() throws Exception {
-        TimeZone tz = TimeZone.getTimeZone("America/Santiago");
-        assertEquals("Chile Summer Time", tz.getDisplayName(true, TimeZone.LONG, Locale.US));
-        assertEquals("Chile Standard Time", tz.getDisplayName(false, TimeZone.LONG, Locale.US));
-        assertEquals("GMT-03:00", tz.getDisplayName(true, TimeZone.SHORT, Locale.US));
-        assertEquals("GMT-04:00", tz.getDisplayName(false, TimeZone.SHORT, Locale.US));
-    }
-
     // http://b/7955614
     public void testApia() throws Exception {
         TimeZone tz = TimeZone.getTimeZone("Pacific/Apia");