Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 17 Apr 2018 20:51:08 +0000 (13:51 -0700)
committerChris Forbes <chrisforbes@google.com>
Tue, 17 Apr 2018 20:51:08 +0000 (13:51 -0700)
commitc13aa9e5729ce1ed5b240a71e23d552a1bea38cc
tree22168fc346effd3fddfa2164a8beff6cdc155c71
parent5b261b1d3a95bef5a6210f47ceb13ef14ef33fb4
parent7719cc7b7f01354d54409ee2e495d2e25e2eec8f
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ie0f7b6e81907b5b35f9eadf696063d0ec147c168