OSDN Git Service

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

Change-Id: I48b8b23c1a571361560492f38ba1795eb62a41ff


Trivial merge