Commit Graph

9 Commits

Author SHA1 Message Date
Amith Yamasani
7dcd20f9a6 resolved conflicts for merge of 162b014c to klp-dev-plus-aosp
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
2013-09-24 14:59:11 -07:00
Sungmin Choi
d3b9dc6356 Add Jakarta timezone
Bug: 10198358
Change-Id: Id35bf1f3e137587016649815d879052d9f8409d9
2013-09-23 16:10:03 -07:00
Elliott Hughes
f1582bc3f5 Get time zone names from CLDR.
Since the intent appears to have been "use the zone's local names if
they're in the same country, and use exemplar locations otherwise",
this patch gets the localized CLDR time zone name or the localized
CLDR exemplar location as appropriate.

Bug: 8145760
Bug: 10179879
Change-Id: Ib3968a493de9f0d3040f3afa6ca07d9f44566a32
2013-09-10 16:46:59 -07:00
Eric Fischer
de6eb79e15 Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.
Bug 2605239

Change-Id: I196aadd21281d18e228a7bf7e947a2b0fa7c6d05
2011-01-19 15:16:20 -08:00
Eric Fischer
da44d9f64a Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules.
Previously it was using America/Araguaina, which does not currently observe
DST.  Brasilia is actually in an area that follows the Sao_Paulo rules.

Bug 2362824
2010-01-08 12:39:44 -08:00
Xianzhu Wang
58d601794e 1. Added the missing timezone for mainland China "Asia/Shanghai".
In each localized version of timezones.xml, the name of this timezone is
defined like "China Standard Time (Beijing)" if some other timezones are
also in this format, or just "Beijing" if all of other timezones are of
city names.

2. Changed time zone name of "Asia/Taipei" from "China Standard Time (Taipei)"
to "Taipei" in some localized versions of timezones.xml.
"China Standard Time" is for China mainland, and the timezone of Taipei
is normally called "Taipei Standard Time" (or "Chungyuan Standard Time").
Though for now the offset of "Taipei Standard Time" and "China Standard Time"
is the same, they were different during 1986-1991 because of daylight saving
of China mainland.
2009-07-17 11:19:50 +08:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
de2d9f5f10 Initial Contribution 2008-10-21 07:00:00 -07:00