OSDN Git Service

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

Change-Id: Ie02b9e293f471be00e266a8b94ec8ca943a3e6c2


Trivial merge