tree ec2b410695109483237ce181e34fac5f03c91c81
parent 4447098b8cbf363b7b7a13b42969dbd2485d559e
parent 16c9c94e490330395bc9a167550c6ec04a4bf605
author Christine Franks <christyfranks@google.com> 1496416917 +0000
committer android-build-merger <android-build-merger@google.com> 1496416917 +0000

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

Change-Id: I6806c3bde4a4739b2e8387840f706e753029d82b