OSDN Git Service

Merge "Merge "Revert the time zone display name logic" into oc-dev am: d9b1697b2d...
authorLei Yu <jackqdyulei@google.com>
Thu, 15 Jun 2017 02:30:49 +0000 (02:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 02:30:49 +0000 (02:30 +0000)
am: 668919209b

Change-Id: Ifa5ed37d8e58f0e5039386f4f1881f8c5a174a72


Trivial merge