tree 3d5c692b6438305e60511d791de96f2d1f5bccd7
parent bcecacdccb7f4001be5f7310e3eaa91f1e4742c6
parent 5685a2e79a1379240e939d5b3c4265373eda3d91
author Peiyong Lin <lpy@google.com> 1523989427 -0700
committer android-build-merger <android-build-merger@google.com> 1523989427 -0700

Merge "[SurfaceFlinger] Make sure data space is set correctly" into pi-dev am: c9340b63a8
am: 5685a2e79a

Change-Id: I6410a8fd5ef65ed58ec2210d43236cb7026513e4