tree bac24a2d371d74d3f66e32c89380d8c83371b93b
parent dfc85f6d3461064097cf10a3af339774bd9ae9b4
parent b69a5c39b540ff3a5566351513bf0902c6011048
author Pierre Couillaud <pierre.couillaud@broadcom.com> 1568664428 -0700
committer android-build-merger <android-build-merger@google.com> 1568664428 -0700

Merge "SurfaceFlinger: retain the sideband layer information for composition" am: 13286c3b51 am: 8d5eb54030 am: 436f8421ed
am: b69a5c39b5

Change-Id: I4eda2768e0f8cd2403492cd3308ddf1fa0d014e4