Commit fe790a73 authored by Daniel Xie's avatar Daniel Xie Committed by Android Git Automerger
Browse files

am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit '779c726a':
  Fixes associated with the tzdata 2015a update
parents afc1b34a 779c726a
......@@ -254,14 +254,6 @@ public class TimeZoneTest extends TestCase {
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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment