diff options
| author | Neil Fuller <nfuller@google.com> | 2014-05-08 14:57:26 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-05-09 15:49:28 +0100 |
| commit | 669e16b836ba680046ed6a61dff35bbda0a6e59f (patch) | |
| tree | 6eca2a4270eacd324fa040784c05634f12d08de5 | |
| parent | 8c4c3df301355f16ac40d1ba155871a0ea976d92 (diff) | |
| download | icu4c-669e16b836ba680046ed6a61dff35bbda0a6e59f.tar.gz | |
Removing data hacks from ICU root.txt
Previously, the standard ICU data was modified
to support special short codes (e.g. PST, CET) in all
locales within SimpleDateFormat.parse().
This commit moves the modification into Java code
leaving the ICU data closer to upstream.
This change is associated with a change in libcore:
I9ae6397cf5335ef325aedb6472d0d66a6127e1dd
Bug: 11413756
Change-Id: I04acd15c62d49c0cf30cc63f60db320bdb8e22e9
| -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 |