Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Mon, 27 Aug 2018 17:31:42 +0000 (10:31 -0700)
committerChris Forbes <chrisforbes@google.com>
Mon, 27 Aug 2018 17:31:42 +0000 (10:31 -0700)
Change-Id: Iaa4f4bec631129c71d93c2a3fa7fa6d5c53acbb5

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

Simple merge