projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a5fa20 9a6dd53)
resolve merge conflicts of 9a6dd53 to master
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:03:27 +0000 (08:03 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:03:27 +0000 (08:03 -0700)
Change-Id: Idb8abdf776d6ece74a2fdfab3941678c9813eea0


Trivial merge
Domain: Graphics System / GL;