Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 17 May 2018 18:20:24 +0000 (11:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 May 2018 18:20:24 +0000 (11:20 -0700)
am: e75fb389ce

Change-Id: Iceff81a070a005635aee4d046ac14f39d91c74d2


Trivial merge