am c2e52d2c: am 7ee4ba68: Merge "Return Olson ids from TimeZoneNames.forLocale in zone.tab order."

* commit 'c2e52d2c766d0e6fa950ac60490f4569002ee545':
  Return Olson ids from TimeZoneNames.forLocale in zone.tab order.