Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 27 Apr 2018 21:50:03 +0000 (14:50 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 27 Apr 2018 21:50:03 +0000 (14:50 -0700)
commita593c5fbbfe231e4ef9bc6930a232430023d93cd
tree3dc1e799742db49c5df80d03a01d2e37e4fbe8e1
parent31009350127eda0fa69403f95a327c11bd4e129d
parentde794f9bc539175dc704cb932a1dea02f1c6b0d1
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I7ae8d3a5d6fd711f7dc63c09b0c5d2fde386bb65