am 7779ef1a: (-s ours) Merge "Revert "Stop showing long names for local timezones when it is ambiguous""
* commit '7779ef1a48e1115aa719c65c3809702f19dca5df': Revert "Stop showing long names for local timezones when it is ambiguous"
This commit is contained in: