Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/deqp-dev
authorPyry Haulos <phaulos@google.com>
Mon, 5 Jun 2017 17:39:43 +0000 (10:39 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 5 Jun 2017 17:39:43 +0000 (10:39 -0700)
Change-Id: Id9c893e5db0817a29f768cca931adc260d350497


Trivial merge