projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0236dfe
9215774
)
Merge remote-tracking branch 'aosp/master' into deqp-dev
author
Chris Forbes
<chrisforbes@google.com>
Fri, 28 Sep 2018 00:25:23 +0000
(17:25 -0700)
committer
Chris Forbes
<chrisforbes@google.com>
Fri, 28 Sep 2018 00:25:23 +0000
(17:25 -0700)
Change-Id: I777f742d2c5fe3559350b0e0ae045af688389730
1
2
android/cts/master/gles2-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
android/cts/master/gles3-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
android/cts/master/vk-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
framework/referencerenderer/rrFragmentOperations.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
android/cts/master/gles2-master.txt
Simple merge
diff --cc
android/cts/master/gles3-master.txt
Simple merge
diff --cc
android/cts/master/vk-master.txt
Simple merge
diff --cc
framework/referencerenderer/rrFragmentOperations.cpp
Simple merge