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:
Neil Fuller
2015-06-08 17:43:23 +00:00
committed by Android Git Automerger

Diff Content Not Available