Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 6 Mar 2018 00:00:45 +0000 (16:00 -0800)
committerChris Forbes <chrisforbes@google.com>
Tue, 6 Mar 2018 00:00:45 +0000 (16:00 -0800)
commit3fa06df50dd00797ba32c14a4c575e4d437bcb68
treee0a5502c511291bf2f84fa3ef0393a7b06a57a3f
parentd2d69fecad0725f52f4d3c97743bd1a585313916
parentd2fbc83d1c7676d8842f92d9f78bf429b3b2787b
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I3a70f61143bc2f7f2b1e3ad51a6179a776b6dfcc