projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03a09e9 297d0b5)
resolve merge conflicts of 297d0b5c to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:23:41 +0000 (10:23 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:23:41 +0000 (10:23 -0700)
Test: python scripts/check_build_sanity.py
Change-Id: I051006ca6e29b2f9ae116261aec1c0c3c234d6e0


Trivial merge
Domain: Graphics System / GL;