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