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)
commit75f865a82e34582e2f0700da49eac17bcb144c13
tree249b26e4efe50a6fb3922edd9a34a98210bd657f
parent92f5641c20527fb29b96ef01ef7ad22a261325f6
parent668919209b43afbd2ba2415a49c0ba06fb819e68
Merge "Merge "Revert the time zone display name logic" into oc-dev am: d9b1697b2d am: 08cd707bad" into oc-dr1-dev-plus-aosp
am: 668919209b

Change-Id: Ifa5ed37d8e58f0e5039386f4f1881f8c5a174a72