projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7385ca9
52bab37
)
resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
author
Nicolas Boichat
<drinkcat@google.com>
Tue, 20 Dec 2016 22:24:55 +0000
(22:24 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Dec 2016 22:24:55 +0000
(22:24 +0000)
am:
52bab3789f
Change-Id: Ie5115233fc6bef645f14f03e69039188dfd6d908
Trivial merge