projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 895dcf4 8afe1d6)
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 18:51:18 +0000 (11:51 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 18:51:18 +0000 (11:51 -0700)
Change-Id: I590938d9af1d9d7071a6c256d38c2e5d006c1e7e


Trivial merge
Domain: Graphics System / GL;