projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73b3923 f5a50cb)
resolve merge conflicts of f5a50cbc to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 16:45:21 +0000 (09:45 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 16:45:21 +0000 (09:45 -0700)
Test: python scripts/check_build_sanity.py
Change-Id: I7c2fef01e29278a44514b1e854c460f960c9368d


Trivial merge
Domain: Graphics System / GL;