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