OSDN Git Service

[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
authorJohn Reck <jreck@google.com>
Thu, 21 Jun 2018 04:10:33 +0000 (21:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jun 2018 04:10:33 +0000 (21:10 -0700)
am: b773556215  -s ours

Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814


Trivial merge