resolve merge conflicts of 9de005f0 to deqp-dev
authorPyry Haulos <phaulos@google.com>
Tue, 9 May 2017 19:09:07 +0000 (12:09 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 9 May 2017 19:09:25 +0000 (12:09 -0700)
commit8ad40352ff86f055e04416d8c96d1a06eb33e52a
tree7d4659a3ee5a2141ae99bb414844fa7fead7944e
parente60918f307c315aa0b13e225de6b59b52efebaf6
parent9de005f0355e389f1782543f34e0fb3c65a0a700
resolve merge conflicts of 9de005f0 to deqp-dev

Test: scripts/check_build_sanity.py
Change-Id: Ica45697139e9e63b0e407283780246d3608457e7