tree 8429d4073d370d9d049f584b05fab8c44a3ad9ae
parent 2ca40f67f635798f7c84a36931feaf5de9fc5ad2
parent 58018eda517416980a472c5028893a21e8e2232a
author Ray Essick <essick@google.com> 1515451897 +0000
committer android-build-merger <android-build-merger@google.com> 1515451897 +0000

Merge "Correcting Buffer Allocation for Shared Display" into mnc-dev am: 6d1537bc60 am: 5410ce3f8e am: 4ef14ee04c am: fec92270b0 am: 19ec51d851 am: 39804d4487 am: 85a0181cef am: 47b0de3bee am: c7a50efa36
am: 58018eda51

Change-Id: I231b16cd2600a1771d89f55e89ad1fcae94f8e84