OSDN Git Service

am 50024b64: am 7779ef1a: (-s ours) Merge "Revert "Stop showing long names for local...
authorNeil Fuller <nfuller@google.com>
Mon, 8 Jun 2015 19:56:03 +0000 (19:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 19:56:03 +0000 (19:56 +0000)
* commit '50024b644bef0ec39703736e4615e7613e62322b':
  Revert "Stop showing long names for local timezones when it is ambiguous"


Trivial merge