tree d61dc162124818c21a7046c6befbcc960d09aff1
parent 7e102bb1bf587a282824fc346f2aaccac41efcd7
parent 03eebddfcaa45958d52ea18175ae833b0608f738
author Peiyong Lin <lpy@google.com> 1523477442 -0700
committer android-build-merger <android-build-merger@google.com> 1523477442 -0700

Merge "[SurfaceFlinger] Fix color mode switch." into pi-dev
am: 03eebddfca

Change-Id: I92227e83173874feca2d6e3fc01cbdc72e1bb76c