Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 6 Jul 2018 22:00:13 +0000 (15:00 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 6 Jul 2018 22:00:13 +0000 (15:00 -0700)
commit3815e42a6f3d7a86b6c5eea9939a8494456e52a5
treec4011ba08ef7b32832c2b72c6cf93c2b44899ae2
parent8173928fce0c2c8571fdb0ba199f19679bc0a8e8
parent458bcabf63f4e3d5b40c79fd02a6a3413d1d038e
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ic89c9892ac27df09c6246f5f86a9013d6c0ea59f