projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2a1b18
ed852bf
)
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
author
Kalle Raita
<kraita@google.com>
Tue, 20 Dec 2016 22:15:49 +0000
(22:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Dec 2016 22:15:49 +0000
(22:15 +0000)
am:
ed852bf557
Change-Id: If6f52d32b3875bba642d0215831a634404872a73
Trivial merge