Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Sat, 10 Nov 2018 02:19:37 +0000 (18:19 -0800)
committerChris Forbes <chrisforbes@google.com>
Sat, 10 Nov 2018 02:19:37 +0000 (18:19 -0800)
Change-Id: I9fb09ca034ae6ad506df24a8c49cca6a0fb0edec


Trivial merge