Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 20 Jul 2018 16:42:17 +0000 (09:42 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 20 Jul 2018 16:42:17 +0000 (09:42 -0700)
commitda52facf7556a29369b75cd17814257c5c9a3612
treeef3842308a8f85384a97341007116330bc558da6
parent433e4ac7054b6504e26917283ecfbefda2c77bf4
parentf99d10b4e4f778863d862b3b3c11a0c3f7d0ac9c
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Id3c4bfc8862ff4d36b40ea9fc91fd5441b0e6ba9