Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 8 Jun 2018 21:04:31 +0000 (14:04 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 8 Jun 2018 21:04:31 +0000 (14:04 -0700)
commit4e453ad888e96808608246fa9c29db565a46ea2f
tree2e2f8af049f72f0fa2ab6e8cdfa19c9d625ea40e
parentb762e8702acfe425612a66d838fa7c1a65ba8cc5
parent19dd72470bdd1a772c08474535e40874624a93b1
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ie16f55b158e9e677980fdd83783ab176d1f9eaa5