From: Justin Klaassen <justinklaassen@google.com>
Date: Mon, 8 May 2017 18:50:16 +0000 (+0000)
Subject: Merge "Night display status restored until valid state" into oc-dev am: 2710490ac9
X-Git-Tag: android-x86-9.0-r1~4290
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a92a67a8783ed5a72d8abaee9541ba1f30aa000;p=android-x86%2Fframeworks-base.git

Merge "Night display status restored until valid state" into oc-dev am: 2710490ac9
am: d2767c45b0

Change-Id: I1af9411b0338112c41112b54aee14f42412536f2
---

9a92a67a8783ed5a72d8abaee9541ba1f30aa000