Merge "Work around VC++ code-gen bug in shader matrix tests." into deqp-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 26 Jan 2018 23:30:16 +0000 (23:30 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 26 Jan 2018 23:30:16 +0000 (23:30 +0000)

Trivial merge