commit 7dcd20f9a6877342a92d0e42c1692a25429960f5
author Amith Yamasani <yamasani@google.com> Tue Sep 24 14:59:11 2013 -0700
committer Amith Yamasani <yamasani@google.com> Tue Sep 24 14:59:11 2013 -0700
tree ea9ccc35a4fe8c215f0f7cfae198c4c303f76fce
parent 786f7eca41edbb4cca7b47b0937049751b345913
parent 162b014cea1a1db4533d299d5c748cf410f452a4

resolved conflicts for merge of 162b014c to klp-dev-plus-aosp

Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b

res/xml/timezones.xml

diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 0030cdd..8c195fb 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -63,6 +63,7 @@
     <timezone id="Asia/Rangoon"></timezone>
     <timezone id="Asia/Krasnoyarsk"></timezone>
     <timezone id="Asia/Bangkok"></timezone>
+    <timezone id="Asia/Jakarta"></timezone>
     <timezone id="Asia/Shanghai"></timezone>
     <timezone id="Asia/Hong_Kong"></timezone>
     <timezone id="Asia/Irkutsk"></timezone>