tree e25484ef40faf2decb96000fcf733949f2f1f162
parent 16c25d81680e9bf66fe7d283e9ee41f6fff6aff2
parent 5a2dcde971e30022259e202c96c312be4df551c2
author Francis Hart <fhart@nvidia.com> 1483562512 +0000
committer android-build-merger <android-build-merger@google.com> 1483562512 +0000

Merge "Surface: Ensure synchronisation of copyBlt" am: 88f77814a1
am: 5a2dcde971

Change-Id: Ifb17a3d79f367bf22e01746209453f8b36bb35b5