OSDN Git Service

am 7779ef1a: (-s ours) Merge "Revert "Stop showing long names for local timezones...
authorNeil Fuller <nfuller@google.com>
Mon, 8 Jun 2015 17:43:23 +0000 (17:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 17:43:23 +0000 (17:43 +0000)
commit50024b644bef0ec39703736e4615e7613e62322b
tree237ebd976074becde9d38b52fa405e5c611fd5e3
parent22684501474d6a3c145b42131c4ad5889fdf6fa4
parent7779ef1a48e1115aa719c65c3809702f19dca5df
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"