Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 25 May 2018 21:45:41 +0000 (14:45 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 25 May 2018 21:45:41 +0000 (14:45 -0700)
commit4cb1bfc6b43b48256bf14e9537984278d326430a
tree593da3b863f62c53d2101ff4461fae714f5a90ba
parent49c6bd504902f81682e8ba71ef3bee9a75cccdf9
parent7e55e5bd60ed3002a64edd1a7b6fc8299d3e496f
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ie70044b186cd4bd875ffd2c441c0e2f9f92a2dcc