Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 26 Jun 2018 16:38:16 +0000 (09:38 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 26 Jun 2018 16:38:16 +0000 (09:38 -0700)
Change-Id: I0d125047b75842a6f52b34a494558c4f593fd7d6


Trivial merge