OSDN Git Service

[automerger skipped] Merge "Add night display pref controllers and change UX" into...
authorChristine Franks <christyfranks@google.com>
Mon, 7 May 2018 18:38:19 +0000 (11:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 18:38:19 +0000 (11:38 -0700)
commitc463f1989930c50aab93f6fe26c6b980c6740229
tree7cc9544e8ef0d6745310c9a174ee9136f89f93e9
parent4ad06ac4ba9ed26d7fa1c63c5c835f05c5368f6a
parentc8ba60d90a98d04c743948307668b0be1de15667
[automerger skipped] Merge "Add night display pref controllers and change UX" into pi-dev am: a1c70443be
am: c8ba60d90a  -s ours

Change-Id: I0430c58aa7d682a7d8b89e1e361e2c8e5b07ae4b