summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2017-03-27 14:12:35 +0000
committer android-build-merger <android-build-merger@google.com> 2017-03-27 14:12:35 +0000
commit0f3235a167ed8fe43324d10680be521e9a781186 (patch)
tree3e4e968919cf9675b89482cca5f52a4c8f019f89
parent84c2fb20700e355ef650b618987f16dd6780a501 (diff)
parentc75dbe9d9c4bee1ea526deaeb33ad493dc4e3e9e (diff)
Merge "Update settings to use latest IDs for zones"
am: c75dbe9d9c Change-Id: If3708653ad78fb38e57508c4d8fac9dd5bffc2c1
-rw-r--r--packages/SettingsLib/res/xml/timezones.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SettingsLib/res/xml/timezones.xml b/packages/SettingsLib/res/xml/timezones.xml
index 4426495b0cbe..12d31cfc6e8f 100644
--- a/packages/SettingsLib/res/xml/timezones.xml
+++ b/packages/SettingsLib/res/xml/timezones.xml
@@ -21,7 +21,7 @@
<timezone id="America/St_Johns"></timezone>
<timezone id="America/Recife"></timezone>
<timezone id="America/Sao_Paulo"></timezone>
- <timezone id="America/Buenos_Aires"></timezone>
+ <timezone id="America/Argentina/Buenos_Aires"></timezone>
<timezone id="America/Godthab"></timezone>
<timezone id="America/Montevideo"></timezone>
<timezone id="Atlantic/South_Georgia"></timezone>
@@ -58,11 +58,11 @@
<timezone id="Asia/Karachi"></timezone>
<timezone id="Asia/Oral"></timezone>
<timezone id="Asia/Yekaterinburg"></timezone>
- <timezone id="Asia/Calcutta"></timezone>
+ <timezone id="Asia/Kolkata"></timezone>
<timezone id="Asia/Colombo"></timezone>
- <timezone id="Asia/Katmandu"></timezone>
+ <timezone id="Asia/Kathmandu"></timezone>
<timezone id="Asia/Almaty"></timezone>
- <timezone id="Asia/Rangoon"></timezone>
+ <timezone id="Asia/Yangon"></timezone>
<timezone id="Asia/Krasnoyarsk"></timezone>
<timezone id="Asia/Bangkok"></timezone>
<timezone id="Asia/Jakarta"></timezone>