am df0028ec: am 91e20200: (-s ours) Merge "Stop showing long names for local timezones when it is ambiguous"
* commit 'df0028ec8a81f11563b2a55fc89a64430e5b8b8d': Stop showing long names for local timezones when it is ambiguous
This commit is contained in: