src/java.base/share/classes/java/time/format/ZoneName.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -23,15 +23,12 @@
  * questions.
  */
 package java.time.format;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 /**
  * A helper class to map a zone name to metazone and back to the
  * appropriate zone id for the particular locale.
  * <p>

@@ -333,10 +330,11 @@
         "Europe/Guernsey", "GMT", "Atlantic/Reykjavik",
         "Asia/Thimphu", "Bhutan", "Asia/Thimphu",
         "America/Eirunepe", "Amazon", "America/Manaus",
         "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi",
         "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk",
+        "Asia/Yangon", "Myanmar", "Asia/Rangoon",
         "America/Goose_Bay", "Atlantic", "America/Halifax",
         "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg",
         "America/Swift_Current", "America_Central", "America/Chicago",
         "America/Guyana", "Guyana", "America/Guyana",
         "Asia/Tokyo", "Japan", "Asia/Tokyo",

@@ -768,10 +766,11 @@
         "America/Virgin", "America/St_Thomas",
         "Asia/Katmandu", "Asia/Kathmandu",
         "America/Indianapolis", "America/Indiana/Indianapolis",
         "Europe/Belfast", "Europe/London",
         "America/Kralendijk", "America/Curacao",
+        "Asia/Rangoon", "Asia/Yangon",
     };
 
     private static final Map<String, String> zidToMzone = new HashMap<>();
     private static final Map<String, String> mzoneToZid = new HashMap<>();
     private static final Map<String, Map<String, String>> mzoneToZidL = new HashMap<>();