Merge "Update timezone data to 2017b"
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index 0b5ec52..725753b 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,9 +3,9 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Thu Mar 2 12:13:41 2017
+// Build date: Tue Mar 21 14:45:01 2017
// tz database: ftp://ftp.iana.org/tz/
-// tz version: 2017a
+// tz version: 2017b
// ICU version: 58.2
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
@@ -13,7 +13,7 @@
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2017a" }
+ TZVersion { "2017b" }
Zones:array {
/* ACT */ :int { 354 } //Z#0
/* AET */ :int { 366 } //Z#1
@@ -132,7 +132,7 @@
/* Africa/Mbabane */ :int { 30 } //Z#45
/* Africa/Mogadishu */ :int { 48 } //Z#46
/* Africa/Monrovia */ :table {
- trans:intvector { -1604359012, 73529070 }
+ trans:intvector { -1604359012, 63593070 }
typeOffsets:intvector { -2588, 0, -2670, 0, 0, 0 }
typeMap:bin { "0102" }
} //Z#47
@@ -940,9 +940,12 @@
} //Z#184
/* America/Port-au-Prince */ :table {
transPre32:intvector { -1, 1770463056 }
- trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600 }
+ trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600, 1489302000, 1509861600 }
typeOffsets:intvector { -17360, 0, -18000, 0, -18000, 3600, -17340, 0 }
- typeMap:bin { "0301020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ typeMap:bin { "03010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ finalRule { "Haiti" }
+ finalRaw:int { -18000 }
+ finalYear:int { 2018 }
} //Z#185
/* America/Port_of_Spain */ :table {
trans:intvector { -1825098836 }
@@ -3103,63 +3106,66 @@
Fiji:intvector {
10, 1, -1, 7200, 0, 0, 15, -1, 10800, 0, 3600
} //_#12
+ 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
- } //_#13
+ } //_#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
Morocco:intvector {
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
- } //_#19
+ } //_#20
NZ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
- } //_#20
+ } //_#21
Namibia:intvector {
8, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 3600
- } //_#21
+ } //_#22
Palestine:intvector {
2, -31, -7, 3600, 0, 9, -31, -7, 3600, 0, 3600
- } //_#22
+ } //_#23
Para:intvector {
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
- } //_#23
+ } //_#24
Syria:intvector {
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
- } //_#24
+ } //_#25
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#25
+ } //_#26
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#26
+ } //_#27
Tonga:intvector {
10, 1, -1, 7200, 0, 0, 15, -1, 10800, 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/icudt58l.dat b/icu4c/source/stubdata/icudt58l.dat
index 8696225..40d0b41 100644
--- a/icu4c/source/stubdata/icudt58l.dat
+++ b/icu4c/source/stubdata/icudt58l.dat
Binary files differ
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 5ba8313..e5ba5e5 100644
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
Binary files differ
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 6bdba48..d73a689 100644
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
Binary files differ
