tree 2e7089e10d39db2afc69d1b3f4e4f356b7808e9e
parent f44588afb1917736264a096ede7739dadb808891
parent 0bb97d9e0b42341128c5860b93a2f8232dba6fd1
author Christine Franks <christyfranks@google.com> 1504133921 +0000
committer android-build-merger <android-build-merger@google.com> 1504133921 +0000

Merge "Update night display intensity coefficients" into oc-mr1-dev
am: 0bb97d9e0b

Change-Id: I858cc44d6037c3b3c33007f71b0721a5663c0740