From: Neil Fuller <nfuller@google.com>
Date: Mon, 8 Jun 2015 17:15:03 +0000 (+0000)
Subject: am df0028ec: am 91e20200: (-s ours) Merge "Stop showing long names for local timezone... 
X-Git-Tag: android-x86-7.1-r1~2497
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7403e81601f19de589b644c4a41d8e57311c49eb;p=android-x86%2Fpackages-apps-Settings.git

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
---

7403e81601f19de589b644c4a41d8e57311c49eb