projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29fce3b 0d15118)
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Wed, 14 Sep 2016 19:02:29 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 19:02:29 +0000 (19:02 +0000)
am: 0d151184d5

Change-Id: I25450768dbdbadf87b17e51453a64c7f7ac7a433


Trivial merge
Domain: Graphics System / GL;