projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e61259 04c959c)
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 17:11:52 +0000 (10:11 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 17:11:52 +0000 (10:11 -0700)
Change-Id: Ibef4448a5117d7f50e43bcd7356342f8765664cd

1  2 
android/cts/master/egl-master.txt patch | diff1 | diff2 | blob | history

diff --cc android/cts/master/egl-master.txt
Simple merge
Domain: Graphics System / GL;