resolved conflicts for merge of 162b014c
to klp-dev-plus-aosp
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
This commit is contained in:
@@ -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>
|
||||
|
Reference in New Issue
Block a user