projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be674b6
07a7e24
)
resolve merge conflicts of ba455914 to master
author
Pyry Haulos
<phaulos@google.com>
Fri, 20 Jan 2017 20:29:48 +0000
(20:29 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Jan 2017 20:29:48 +0000
(20:29 +0000)
am:
07a7e24da3
Change-Id: Iece28ec157fd5f603009ffb6fc9023cc0164ab1d
Trivial merge