Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 4 Oct 2018 22:16:33 +0000 (15:16 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 4 Oct 2018 22:16:33 +0000 (15:16 -0700)
Change-Id: Icaac56195ab453f7940956fdd6ac8a252eb5626d


Trivial merge