OSDN Git Service

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

Change-Id: I42041afe19e43a5ab7f00376f5b9ab727e6571d0


Trivial merge