Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 15 May 2018 15:57:53 +0000 (08:57 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 15 May 2018 15:57:53 +0000 (08:57 -0700)
commitc9ce36c4e044cfdf52c2cc751165b5e4841dc066
tree329f23ac42bd20e9392ca4d0e8e980cd89d5e770
parent09cecb251316dfb0684bdb28b72aa87f1b3714b5
parent4b64287f09c974ff914b3d1c9cf1b6dc8cda24d4
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ic7f1d3a9f9c59e23a51193eb616e62e638280877