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

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