Merge tag 'android-6.0.1_r30' into HEAD

Ticket: RM-234
Android 6.0.1 release 30

8 files changed, 83 insertions, 63 deletions

diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt
index 3eb715487..c460bead6 100644
--- a/icu4c/source/data/misc/metaZones.txt
+++ b/icu4c/source/data/misc/metaZones.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/metaZones.xml
@@ -591,6 +591,9 @@ metaZones:table(nofallback){
         Ponape{
             001{"Pacific/Ponape"}
         }
+        Pyongyang{
+            001{"Asia/Pyongyang"}
+        }
         Qyzylorda{
             001{"Asia/Qyzylorda"}
         }
@@ -2054,6 +2057,13 @@ metaZones:table(nofallback){
         "America:Metlakatla"{
             {
                 "America_Pacific",
+                "1970-01-01 00:00",
+                "2015-11-01 10:00",
+            }
+            {
+                "Alaska",
+                "2015-11-01 10:00",
+                "9999-12-31 23:59",
             }
         }
         "America:Mexico_City"{
@@ -2746,6 +2756,11 @@ metaZones:table(nofallback){
             {
                 "Irkutsk",
                 "2014-10-25 16:00",
+                "2016-03-26 18:00",
+            }
+            {
+                "Yakutsk",
+                "2016-03-26 18:00",
                 "9999-12-31 23:59",
             }
         }
@@ -3065,6 +3080,11 @@ metaZones:table(nofallback){
                 "1970-01-01 00:00",
                 "2015-08-14 15:00",
             }
+            {
+                "Pyongyang",
+                "2015-08-14 15:00",
+                "9999-12-31 23:59",
+            }
         }
         "Asia:Qatar"{
             {
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index 405148149..89a501d6b 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/windowsZones.xml
@@ -23,8 +23,8 @@ windowsZones:table(nofallback){
         "Alaskan Standard Time"{
             001{"America/Anchorage"}
             US{
-                "America/Anchorage America/Juneau America/Nome America/Sitka America/"
-                "Yakutat"
+                "America/Anchorage America/Juneau America/Metlakatla America/Nome Ame"
+                "rica/Sitka America/Yakutat"
             }
         }
         "Arab Standard Time"{
@@ -203,6 +203,10 @@ windowsZones:table(nofallback){
             001{"Australia/Brisbane"}
             AU{"Australia/Brisbane Australia/Lindeman"}
         }
+        "E. Europe Standard Time"{
+            001{"Europe/Chisinau"}
+            MD{"Europe/Chisinau"}
+        }
         "E. South America Standard Time"{
             001{"America/Sao_Paulo"}
             BR{"America/Sao_Paulo"}
@@ -264,7 +268,6 @@ windowsZones:table(nofallback){
             001{"Europe/Bucharest"}
             CY{"Asia/Nicosia"}
             GR{"Europe/Athens"}
-            MD{"Europe/Chisinau"}
             RO{"Europe/Bucharest"}
         }
         "Georgian Standard Time"{
@@ -399,25 +402,25 @@ windowsZones:table(nofallback){
         }
         "North Asia East Standard Time"{
             001{"Asia/Irkutsk"}
-            RU{"Asia/Irkutsk Asia/Chita"}
+            RU{"Asia/Irkutsk"}
         }
         "North Asia Standard Time"{
             001{"Asia/Krasnoyarsk"}
             RU{"Asia/Krasnoyarsk Asia/Novokuznetsk"}
         }
+        "North Korea Standard Time"{
+            001{"Asia/Pyongyang"}
+            KP{"Asia/Pyongyang"}
+        }
         "Pacific SA Standard Time"{
             001{"America/Santiago"}
             AQ{"Antarctica/Palmer"}
             CL{"America/Santiago"}
         }
-        "Pacific Standard Time (Mexico)"{
-            001{"America/Santa_Isabel"}
-            MX{"America/Santa_Isabel"}
-        }
         "Pacific Standard Time"{
             001{"America/Los_Angeles"}
             CA{"America/Vancouver America/Dawson America/Whitehorse"}
-            MX{"America/Tijuana"}
+            MX{"America/Tijuana America/Santa_Isabel"}
             US{"America/Los_Angeles"}
             ZZ{"PST8PDT"}
         }
@@ -468,6 +471,7 @@ windowsZones:table(nofallback){
             001{"America/Bogota"}
             BR{"America/Rio_Branco America/Eirunepe"}
             CA{"America/Coral_Harbour"}
+            CL{"Pacific/Easter"}
             CO{"America/Bogota"}
             EC{"America/Guayaquil"}
             JM{"America/Jamaica"}
@@ -514,7 +518,6 @@ windowsZones:table(nofallback){
             ID{"Asia/Jakarta Asia/Pontianak"}
             KH{"Asia/Phnom_Penh"}
             LA{"Asia/Vientiane"}
-            MN{"Asia/Hovd"}
             TH{"Asia/Bangkok"}
             VN{"Asia/Saigon"}
             ZZ{"Etc/GMT-7"}
@@ -696,7 +699,7 @@ windowsZones:table(nofallback){
         }
         "Yakutsk Standard Time"{
             001{"Asia/Yakutsk"}
-            RU{"Asia/Yakutsk Asia/Khandyga"}
+            RU{"Asia/Yakutsk Asia/Chita Asia/Khandyga"}
         }
     }
 }
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index ab059de78..e7f44cdf7 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -1,11 +1,11 @@
 //---------------------------------------------------------
-// Copyright (C) 2003-2015, International Business Machines
+// Copyright (C) 2003-2016, International Business Machines
 // Corporation and others.  All Rights Reserved.
 //---------------------------------------------------------
 // Build tool:  tz2icu
-// Build date:  Tue Oct 13 15:06:09 2015
+// Build date:  Wed Feb 24 15:04:49 2016
 // tz database: ftp://ftp.iana.org/tz/
-// tz version:  2015g
+// tz version:  2016a
 // ICU version: 55.1
 //---------------------------------------------------------
 // >> !!! >>   THIS IS A MACHINE-GENERATED FILE   << !!! <<
@@ -13,7 +13,7 @@
 //---------------------------------------------------------
 
 zoneinfo64:table(nofallback) {
- TZVersion { "2015g" }
+ TZVersion { "2016a" }
  Zones:array { 
   /* ACT */ :int { 348 } //Z#0
   /* AET */ :int { 360 } //Z#1
@@ -383,15 +383,7 @@ zoneinfo64:table(nofallback) {
     typeOffsets:intvector { -12560, 0, -14400, 0, -10800, 0 }
     typeMap:bin { "0102" }
   } //Z#96
-  /* America/Cayman */ :table {
-    transPre32:intvector { -1, 1770465228 }
-    trans:intvector { -1827687169, 1457852400, 1478412000 }
-    typeOffsets:intvector { -19532, 0, -18431, 0, -18000, 0, -18000, 3600 }
-    typeMap:bin { "01020302" }
-    finalRule { "US" }
-    finalRaw:int { -18000 }
-    finalYear:int { 2017 }
-  } //Z#97
+  /* America/Cayman */ :int { 181 } //Z#97
   /* America/Chicago */ :table {
     transPre32:intvector { -1, 1577320096 }
     trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -1563724800, -1551632400, -1538928000, -1520182800, -1504454400, -1491757200, -1473004800, -1459702800, -1441555200, -1428253200, -1410105600, -1396803600, -1378656000, -1365354000, -1347206400, -1333904400, -1315152000, -1301850000, -1283702400, -1270400400, -1252252800, -1238950800, -1220803200, -1207501200, -1189353600, -1176051600, -1157299200, -1144602000, -1125849600, -1112547600, -1094400000, -1081098000, -1067788800, -1045414800, -1031500800, -1018198800, -1000051200, -986749200, -967996800, -955299600, -936547200, -923245200, -905097600, -891795600, -880214400, -765392400, -747244800, -733942800, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 }
@@ -794,9 +786,12 @@ zoneinfo64:table(nofallback) {
   } //Z#163
   /* America/Metlakatla */ :table {
     transPre32:intvector { -1, 1069600474, -1, 2106011674 }
-    trans:intvector { -880207200, -765385200, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400 }
-    typeOffsets:intvector { 54822, 0, -31578, 0, -28800, 0, -28800, 3600 }
-    typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302" }
+    trans:intvector { -880207200, -765385200, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 1446372000, 1457866800, 1478426400 }
+    typeOffsets:intvector { 54822, 0, -32400, 0, -32400, 3600, -31578, 0, -28800, 0, -28800, 3600 }
+    typeMap:bin { "03040504050405040504050405040504050405040504050405040504050405040504010201" }
+    finalRule { "US" }
+    finalRaw:int { -32400 }
+    finalYear:int { 2017 }
   } //Z#164
   /* America/Mexico_City */ :table {
     trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, -975261600, -963169200, -917114400, -907354800, -821901600, -810068400, -627501600, -612990000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000 }
@@ -921,6 +916,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -1946918424 }
     typeOffsets:intvector { -19088, 0, -19176, 0, -18000, 0 }
     typeMap:bin { "0102" }
+    links:intvector { 97, 181 }
   } //Z#181
   /* America/Pangnirtung */ :table {
     trans:intvector { -1546300800, -880221600, -765399600, -147902400, -131572800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954662400, 972802800, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
@@ -1013,14 +1009,7 @@ zoneinfo64:table(nofallback) {
     links:intvector { 187, 195, 367 }
   } //Z#195
   /* America/Rosario */ :int { 67 } //Z#196
-  /* America/Santa_Isabel */ :table {
-    trans:intvector { -1514736000, -1451667600, -1343062800, -1234803600, -1222963200, -1207242000, -873820800, -761677200, -686073600, -661539600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200 }
-    typeOffsets:intvector { -27568, 0, -28800, 0, -28800, 3600, -25200, 0 }
-    typeMap:bin { "030103010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
-    finalRule { "Mexico" }
-    finalRaw:int { -28800 }
-    finalYear:int { 2003 }
-  } //Z#197
+  /* America/Santa_Isabel */ :int { 215 } //Z#197
   /* America/Santarem */ :table {
     trans:intvector { -1767212472, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 1214280000 }
     typeOffsets:intvector { -13128, 0, -14400, 0, -14400, 3600, -10800, 0 }
@@ -1114,7 +1103,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -28800 }
     finalYear:int { 2011 }
-    links:intvector { 115, 215, 526 }
+    links:intvector { 115, 197, 215, 526 }
   } //Z#215
   /* America/Toronto */ :table {
     transPre32:intvector { -1, 1928231148 }
@@ -1310,9 +1299,9 @@ zoneinfo64:table(nofallback) {
   } //Z#251
   /* Asia/Calcutta */ :int { 282 } //Z#252
   /* Asia/Chita */ :table {
-    trans:intvector { -1579419232, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701791200, 717512400, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1080406800, 1099155600, 1111856400, 1130605200, 1143306000, 1162054800, 1174755600, 1193504400, 1206810000, 1224954000, 1238259600, 1256403600, 1269709200, 1288458000, 1301158800, 1414252800 }
+    trans:intvector { -1579419232, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701791200, 717512400, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1080406800, 1099155600, 1111856400, 1130605200, 1143306000, 1162054800, 1174755600, 1193504400, 1206810000, 1224954000, 1238259600, 1256403600, 1269709200, 1288458000, 1301158800, 1414252800, 1459015200 }
     typeOffsets:intvector { 27232, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 }
-    typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030501" }
+    typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" }
   } //Z#253
   /* Asia/Choibalsan */ :table {
     trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200, 1427479200, 1443193200 }
@@ -1439,7 +1428,7 @@ zoneinfo64:table(nofallback) {
     typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" }
   } //Z#276
   /* Asia/Karachi */ :table {
-    trans:intvector { -1988166492, -862637400, -764145000, -576135000, 1018119660, 1033840860, 1212260400, 1225476000, 1239735600, 1257012000 }
+    trans:intvector { -1988166492, -862637400, -764145000, -576135000, 1018119600, 1033840800, 1212260400, 1225476000, 1239735600, 1257012000 }
     typeOffsets:intvector { 16092, 0, 18000, 0, 18000, 3600, 19800, 0, 19800, 3600 }
     typeMap:bin { "03040301020102010201" }
     links:intvector { 277, 534 }
@@ -1621,9 +1610,12 @@ zoneinfo64:table(nofallback) {
     typeMap:bin { "0103040304030403040304030403040304030403040302010201020102030403040304030403040304030403040304020103" }
   } //Z#314
   /* Asia/Tehran */ :table {
-    trans:intvector { -757394744, 247177800, 259272000, 277758000, 283982400, 290809800, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600, 1679430600, 1695324600, 1710966600, 1726860600, 1742589000, 1758483000, 1774125000, 1790019000, 1805661000, 1821555000, 1837197000, 1853091000, 1868733000, 1884627000, 1900355400, 1916249400, 1931891400, 1947785400, 1963427400, 1979321400, 1994963400, 2010857400, 2026585800, 2042479800, 2058121800, 2074015800, 2089657800, 2105551800, 2121193800, 2137087800 }
+    trans:intvector { -757394744, 247177800, 259272000, 277758000, 283982400, 290809800, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600, 1679430600, 1695324600, 1710966600, 1726860600, 1742589000, 1758483000, 1774125000, 1790019000, 1805661000, 1821555000, 1837197000, 1853091000, 1868733000, 1884627000, 1900355400, 1916249400, 1931891400, 1947785400, 1963427400, 1979321400, 1994963400, 2010857400, 2026585800, 2042479800, 2058121800, 2074015800, 2089657800, 2105551800 }
     typeOffsets:intvector { 12344, 0, 12600, 0, 12600, 3600, 14400, 0, 14400, 3600 }
-    typeMap:bin { "010304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    typeMap:bin { "01030403010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    finalRule { "Iran" }
+    finalRaw:int { 12600 }
+    finalYear:int { 2037 }
     links:intvector { 315, 515 }
   } //Z#315
   /* Asia/Tel_Aviv */ :int { 274 } //Z#316
@@ -3072,60 +3064,63 @@ zoneinfo64:table(nofallback) {
   Haiti:intvector {
     2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
   } //_#13
+  Iran:intvector {
+    2, 21, 0, 0, 0, 8, 21, 0, 0, 0, 3600
+  } //_#14
   Jordan:intvector {
     2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
-  } //_#14
+  } //_#15
   LH:intvector {
     9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
-  } //_#15
+  } //_#16
   Lebanon:intvector {
     2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
-  } //_#16
+  } //_#17
   Mexico:intvector {
     3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
-  } //_#17
+  } //_#18
   Moldova:intvector {
     2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
-  } //_#18
+  } //_#19
   Mongol:intvector {
     2, -31, -7, 7200, 0, 8, -30, -7, 0, 0, 3600
-  } //_#19
+  } //_#20
   Morocco:intvector {
     2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
-  } //_#20
+  } //_#21
   NZ:intvector {
     8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
-  } //_#21
+  } //_#22
   Namibia:intvector {
     8, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 3600
-  } //_#22
+  } //_#23
   Palestine:intvector {
     2, -31, -6, 86400, 0, 9, 21, -6, 0, 0, 3600
-  } //_#23
+  } //_#24
   Para:intvector {
     9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
-  } //_#24
+  } //_#25
   Syria:intvector {
     2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
-  } //_#25
+  } //_#26
   SystemV:intvector {
     3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
-  } //_#26
+  } //_#27
   Thule:intvector {
     2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
-  } //_#27
+  } //_#28
   Troll:intvector {
     2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
-  } //_#28
+  } //_#29
   US:intvector {
     2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
-  } //_#29
+  } //_#30
   WS:intvector {
     8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
-  } //_#30
+  } //_#31
   Zion:intvector {
     2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
-  } //_#31
+  } //_#32
  }
  Regions:array {
   "AU", //Z#0 ACT
diff --git a/icu4c/source/stubdata/icudt55l.dat b/icu4c/source/stubdata/icudt55l.dat
index 6f9011cff..da16c6f21 100644
--- a/icu4c/source/stubdata/icudt55l.dat
+++ b/icu4c/source/stubdata/icudt55l.dat
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index 80035322d..15a251dc9 100644
--- a/icu4c/source/test/intltest/tztest.cpp
+++ b/icu4c/source/test/intltest/tztest.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2015, International Business Machines Corporation
+ * Copyright (c) 1997-2016, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
 
@@ -2025,6 +2025,7 @@ void TimeZoneTest::TestCanonicalID() {
         {"America/Marigot", "America/Port_of_Spain"},
         {"America/Montserrat", "America/Port_of_Spain"},
         {"America/Panama", "America/Cayman"},
+        {"America/Santa_Isabel", "America/Tijuana"},
         {"America/Shiprock", "America/Denver"},
         {"America/St_Barthelemy", "America/Port_of_Spain"},
         {"America/St_Kitts", "America/Port_of_Spain"},
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 4b06ac9b8..ce19e7609 100644
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index e19365c73..437a582af 100644
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index ee9d5e7e8..abbd06349 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * Copyright (C) 2000-2015, International Business Machines Corporation and    *
+ * Copyright (C) 2000-2016, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -1520,6 +1520,7 @@ public class TimeZoneTest extends TestFmwk
                 {"America/Marigot", "America/Port_of_Spain"},
                 {"America/Montserrat", "America/Port_of_Spain"},
                 {"America/Panama", "America/Cayman"},
+                {"America/Santa_Isabel", "America/Tijuana"},
                 {"America/Shiprock", "America/Denver"},
                 {"America/St_Barthelemy", "America/Port_of_Spain"},
                 {"America/St_Kitts", "America/Port_of_Spain"},