tree 00126032501f4126fd34da56ea56fd812e634222
parent 9f8c9b643e8c866d37d445ebc1aa6b359d4a76db
parent 72128ee8d96161829babcec659128231f7067265
author Chia-I Wu <olv@google.com> 1525465203 -0700
committer android-build-merger <android-build-merger@google.com> 1525465203 -0700

Merge "surfaceflinger: fix color tranform matrix races" into pi-dev
am: 72128ee8d9

Change-Id: I41dcd591598934c0765a24139bccf4dce27d79a4