diff options
| author | Neil Fuller <nfuller@google.com> | 2014-05-15 12:15:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-15 12:15:04 +0000 |
| commit | 8a78a97c715df5bc0b35f6ff454c1180875a355b (patch) | |
| tree | f97dfdf32f74cedda8e15e80ad5162765f96e51f | |
| parent | ca96fee299d32bee36d0d35ab02df70c81301736 (diff) | |
| parent | 669e16b836ba680046ed6a61dff35bbda0a6e59f (diff) | |
| download | icu4c-8a78a97c715df5bc0b35f6ff454c1180875a355b.tar.gz | |
Merge "Removing data hacks from ICU root.txt"
| -rw-r--r-- | data/zone/root.txt | 62 | ||||
| -rw-r--r-- | stubdata/icudt53l.dat | bin | 18716992 -> 18716592 bytes |
2 files changed, 0 insertions, 62 deletions
diff --git a/data/zone/root.txt b/data/zone/root.txt index 832fc121..15ebbe57 100644 --- a/data/zone/root.txt +++ b/data/zone/root.txt @@ -12,15 +12,6 @@ root{ Version{"2.0.97.37"} zoneStrings{ - // Begin android-added - ""{ - ec{""} - ld{""} - ls{""} - sd{""} - ss{""} - } - // End android-added "Africa:Asmera"{ ec{"Asmara"} } @@ -114,59 +105,6 @@ root{ "Pacific:Truk"{ ec{"Chuuk"} } - // Begin android-added - "meta:Africa_Central"{ - ss{"CAT"} - } - "meta:Africa_Eastern"{ - ss{"EAT"} - } - "meta:Africa_Southern"{ - ss{"SAST"} - } - "meta:Africa_Western"{ - sd{"WAST"} - ss{"WAT"} - } - "meta:America_Central"{ - sd{"CDT"} - sg{"CT"} - ss{"CST"} - } - "meta:America_Eastern"{ - sd{"EDT"} - sg{"ET"} - ss{"EST"} - } - "meta:America_Mountain"{ - sd{"MDT"} - sg{"MT"} - ss{"MST"} - } - "meta:America_Pacific"{ - sd{"PDT"} - sg{"PT"} - ss{"PST"} - } - "meta:Europe_Central"{ - sd{"CEST"} - sg{"CET"} - ss{"CET"} - } - "meta:Europe_Eastern"{ - sd{"EEST"} - sg{"EET"} - ss{"EET"} - } - "meta:Europe_Western"{ - sd{"WEST"} - sg{"WET"} - ss{"WET"} - } - "meta:GMT"{ - ss{"GMT"} - } - // End android-added fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} gmtZeroFormat{"GMT"} diff --git a/stubdata/icudt53l.dat b/stubdata/icudt53l.dat Binary files differindex caac5fc4..7fbd886d 100644 --- a/stubdata/icudt53l.dat +++ b/stubdata/icudt53l.dat |