tree f82d73601d5ebf50f6d9062e86e3723a51d30cbb
parent f5bf546a565c8cca16f31a42eb0b3542141d63f4
parent 3823b386912ff740d7879b760dc0804c1546c57a
author Peiyong Lin <lpy@google.com> 1523401834 -0700
committer android-build-merger <android-build-merger@google.com> 1523401834 -0700

Merge "[SurfaceFinger] Adds auto color mode support in SurfaceFlinger." into pi-dev am: ac6521d7cf
am: 3823b38691

Change-Id: I11f228b0e7e1ff701f4c2c993b6ae10ef8b117dc