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)
commit954606c5ec91376f9f3abd8288eb2fe94ca8ba2c
treedf1f36724001e9903156cfdf9f99809087a07244
parentbaa53694ca65f8bf252909387370458ae8e2506f
parent08cd707badcd6c3c3be08377e61b6861c59646c4
Merge "Revert the time zone display name logic" into oc-dev am: d9b1697b2d
am: 08cd707bad

Change-Id: I48b8b23c1a571361560492f38ba1795eb62a41ff