Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 15 Jun 2018 21:18:19 +0000 (14:18 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 15 Jun 2018 21:18:19 +0000 (14:18 -0700)
commit8792acfc4ebd18a7fc397385e86b07043eaef5fc
tree71a396aad0b15a246f56a46b7960c188baaa9426
parent4e453ad888e96808608246fa9c29db565a46ea2f
parent39fbe90f21cb24b46e1bbc2d49e75604453977c0
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I7f11f515a7d9ce3e10b0b90070acb8639da97763