tree 1c8181f3e75e53219e5f101e6b6572feeee5e018
parent 400f09200ee9df3c27b7c9e1ac324a6b76a926e2
parent bdaada0af954a07816bc4f144f6127821a245fbc
author Christine Franks <christyfranks@google.com> 1501037682 +0000
committer android-build-merger <android-build-merger@google.com> 1501037682 +0000

Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
am: bdaada0af9

Change-Id: I1b15ab6395b4935d1169246d42fa0a6f0c588a3d