projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e60918f 9de005f)
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)
Test: scripts/check_build_sanity.py
Change-Id: Ica45697139e9e63b0e407283780246d3608457e7


Trivial merge
Domain: Graphics System / GL;