Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 13 Jul 2018 18:33:07 +0000 (11:33 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 13 Jul 2018 18:33:07 +0000 (11:33 -0700)
commit433e4ac7054b6504e26917283ecfbefda2c77bf4
treef571c984002fd2a573d2cda2af8d8ea51fc9a1f0
parent3815e42a6f3d7a86b6c5eea9939a8494456e52a5
parente11f1e1f6a7052724f62fc0ebe0e641e5eaa3b40
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I40b59c801207ce6fa52450ba83f719a56b153b0f