commit 162b014cea1a1db4533d299d5c748cf410f452a4
author Amith Yamasani <yamasani@google.com> Tue Sep 24 21:49:54 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 24 21:49:54 2013 +0000
tree 0934c594c0b60510d1313471335736dacfaf4632
parent 0865ffb32d84cdd26bf5136d496b129efbdfc4f1
parent d3b9dc63568cb689c1fdcc22883cbd898d4b38c8

Merge "Add Jakarta timezone" into klp-dev

res/xml/timezones.xml

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>