Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 12 Oct 2018 17:40:28 +0000 (10:40 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 12 Oct 2018 17:40:53 +0000 (10:40 -0700)
Change-Id: Ib59c5ae7ad294e29d1289ced4e5784ab7ee7262a
Bug: b/117653703

1  2 
android/cts/master/vk-master.txt

Simple merge