OSDN Git Service

Merge "Adjustments based on the changes in ZoneGetter(settingslib)"
authorLei Yu <jackqdyulei@google.com>
Fri, 7 Oct 2016 17:34:19 +0000 (17:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Oct 2016 17:34:22 +0000 (17:34 +0000)

Trivial merge