[automerger skipped] Merge "DO NOT MERGE: Drop dEQP-VK.image.qualifiers.{coherent...
authorChad Versace <chadversary@google.com>
Tue, 30 Oct 2018 22:04:00 +0000 (15:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 Oct 2018 22:04:00 +0000 (15:04 -0700)
am: be0cc29007  -s ours

Change-Id: If90fc129cd86fa0cdb688322a8998427785dc1e1


Trivial merge