Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 20 Jun 2018 18:01:27 +0000 (11:01 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 20 Jun 2018 18:01:27 +0000 (11:01 -0700)
commitf5035a1f0032479f0cf1535c58a06e31f00f1be6
treee7486c1979c72bed45f44b0b1cb400d93e8f833b
parente9b67dfa35cd91c5d09a63e3f3aaeae5bf8c3ba9
parent4c88ebdd7991b145c700d8ffc9e1b2c5bd0a9353
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ib92c7970331e8a0512b1a02af5d501525f68adc9