Merge vk-gl-cts/master into aosp/deqp-dev
authorPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 16:20:30 +0000 (09:20 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 16:20:30 +0000 (09:20 -0700)

Trivial merge