Merge "[automerger] DO NOT MERGE: Fix dEQP-VK.api.copy_and_blit.image_to_image_depth...
authorBas Nieuwenhuizen <basni@google.com>
Fri, 23 Feb 2018 22:41:30 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Feb 2018 22:41:30 +0000 (22:41 +0000)
am: 541e9cb273  -s ours

Change-Id: I46a70369769131a65e2394a3a08a0eb244713bdb


Trivial merge