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