summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-09-24 21:49:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-24 21:49:54 +0000
commit162b014cea1a1db4533d299d5c748cf410f452a4 (patch)
tree0934c594c0b60510d1313471335736dacfaf4632 /res
parent0865ffb32d84cdd26bf5136d496b129efbdfc4f1 (diff)
parentd3b9dc63568cb689c1fdcc22883cbd898d4b38c8 (diff)
downloadpackages_apps_Settings-162b014cea1a1db4533d299d5c748cf410f452a4.zip
packages_apps_Settings-162b014cea1a1db4533d299d5c748cf410f452a4.tar.gz
packages_apps_Settings-162b014cea1a1db4533d299d5c748cf410f452a4.tar.bz2
Merge "Add Jakarta timezone" into klp-dev
Diffstat (limited to 'res')
-rw-r--r--res/xml/timezones.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index f9a36f3..968fe91 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -63,6 +63,7 @@
<timezone id="Asia/Rangoon">Yangon</timezone>
<timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
<timezone id="Asia/Bangkok">Bangkok</timezone>
+ <timezone id="Asia/Jakarta">Jakarta</timezone>
<timezone id="Asia/Shanghai">Beijing</timezone>
<timezone id="Asia/Hong_Kong">Hong Kong</timezone>
<timezone id="Asia/Irkutsk">Irkutsk</timezone>