Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 13 Jul 2018 01:59:16 +0000 (18:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 01:59:16 +0000 (18:59 -0700)
am: f76e580fa8

Change-Id: Ia91eb9f08334aa37a565a37bd835d7451d90650a

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

Simple merge