am 50024b64: am 7779ef1a: (-s ours) Merge "Revert "Stop showing long names for local timezones when it is ambiguous""

Browse Source

* commit '50024b644bef0ec39703736e4615e7613e62322b':
  Revert "Stop showing long names for local timezones when it is ambiguous"

...

This commit is contained in:

Neil Fuller

2015-06-08 19:56:03 +00:00

committed by Android Git Automerger

parent 05285a4498 50024b644b

commit a65a70e33e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available