[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"

am: b773556215  -s ours

Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814
This commit is contained in:
John Reck
2018-06-20 21:10:33 -07:00
committed by android-build-merger

Diff Content Not Available