OSDN Git Service

Merge "Support native and srgb for night display" into oc-dr1-dev
authorChristine Franks <christyfranks@google.com>
Fri, 27 Oct 2017 03:23:01 +0000 (03:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Oct 2017 03:23:01 +0000 (03:23 +0000)
am: 37082aa53e  -s ours

Change-Id: I6a7d3864db78ac95a175cc9097a821daa6ea6658


Trivial merge