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