[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulka...
authorChris Forbes <chrisforbes@google.com>
Mon, 10 Sep 2018 22:26:16 +0000 (15:26 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Sep 2018 22:26:16 +0000 (15:26 -0700)
commit4eb31660f7c4d63b1f862a8f8e97eb1409a87077
tree9ca671348117859f207d10db16ae53548690516c
parent79749eabc6cb12774b34dc021fe7aee8862729c0
parentdf6a2ffc6e0bb46fd9ac65729e3ab09b2a6ec7e5
[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
am: df6a2ffc6e  -s ours

Change-Id: I5a7f593b5301a76a4e4a1d89c9d06a2a08a4fe50