Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into stage-aosp-pi-cts-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 25 Jul 2018 21:07:54 +0000 (14:07 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 25 Jul 2018 21:07:54 +0000 (14:07 -0700)
Bug: b/111845139
Change-Id: I7cc4f644cfc54904213b959338b80f990f034351


Trivial merge