am 91e20200: (-s ours) Merge "Stop showing long names for local timezones when it is ambiguous"

* commit '91e20200c5532bf4117908223a08ff49666e1a6a':
  Stop showing long names for local timezones when it is ambiguous
This commit is contained in:
Neil Fuller
2015-06-08 16:59:00 +00:00
committed by Android Git Automerger

Diff Content Not Available