tree 2e7891f92577e3647865171d1b4c48e4697d661b
parent ebcdb0881bc07cea657d1979d27620af190461bb
parent 28706f020b3bb4e93703e3405c03dc459fe1a04b
author Winson Chung <winsonc@google.com> 1557953227 -0700
committer android-build-merger <android-build-merger@google.com> 1557953227 -0700

Merge "Disable auto dimming when color sampling is enabled" into qt-dev
am: 28706f020b

Change-Id: Ibc07ee44c30b76e2ddf1aa4b1f7bef07a3a39ae3