am 6d5c0e41: am 3ded7ddb: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev

* commit '6d5c0e411ca35cbdc80cc443e5c6794592c82444':
  Work around an icu4c bug in TimeZoneNames::getDisplayName.
This commit is contained in:
Elliott Hughes
2014-07-30 19:02:06 +00:00
committed by Android Git Automerger

View File

@@ -21,7 +21,7 @@
<timezone id="America/Santiago"></timezone>
<timezone id="America/St_Johns"></timezone>
<timezone id="America/Sao_Paulo"></timezone>
<timezone id="America/Argentina/Buenos_Aires"></timezone>
<timezone id="America/Buenos_Aires"></timezone>
<timezone id="America/Godthab"></timezone>
<timezone id="America/Montevideo"></timezone>
<timezone id="Atlantic/South_Georgia"></timezone>