projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52bce38
4336457
)
resolve merge conflicts of 433645782 to oc-dev-plus-aosp
author
Pyry Haulos
<phaulos@google.com>
Mon, 3 Apr 2017 01:17:46 +0000
(18:17 -0700)
committer
Pyry Haulos
<phaulos@google.com>
Mon, 3 Apr 2017 01:17:46 +0000
(18:17 -0700)
Trivial merge
projects / platform / upstream / VK-GL-CTS.git / commitdiff