Christine Franks 5e45ca09b8 Merge "Fix night display activation behavior after reboot" into oc-dev am: bd75ee0015 ...

am: 16c9c94e49

Change-Id: I6806c3bde4a4739b2e8387840f706e753029d82b

2017-06-02 15:21:57 +00:00

..

android

Merge "Fix night display activation behavior after reboot" into oc-dev am: bd75ee0015

2017-06-02 15:21:57 +00:00

google/android

…