am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aosp

* commit '7dcd20f9a6877342a92d0e42c1692a25429960f5':
  Add Jakarta timezone
This commit is contained in:
Amith Yamasani
2013-09-24 15:05:02 -07:00
committed by Android Git Automerger

View File

@@ -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>