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)
commitd4284bb097f0bf59665423bc651f0686ee40986b
tree2141a174f33c414a7a12aed5852e7269c2da3dc9
parentf5035a1f0032479f0cf1535c58a06e31f00f1be6
parent2ad3da270c035c302cb70ae3cd5becb94eb0fdaa
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I0d125047b75842a6f52b34a494558c4f593fd7d6