Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 7 Aug 2018 15:50:26 +0000 (08:50 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 7 Aug 2018 15:50:26 +0000 (08:50 -0700)
commitac5467545ea7723cbd2aa2e2dccf94d220790157
treeae42c70f0aadba05fcab94b28311c794c4907bea
parent6e8225079dcdb5ed514535ca33dabbcc04566e9a
parent1c56bf1f9f5b69576907dcd548ecd2e038aab160
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I6183377aa1a154927f42bfb0110c32235498bc37