OSDN Git Service

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

Change-Id: I0b71a7b1e52c57658b7cef1521b16c15e1f2481d


Trivial merge