projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
01c922f
cc5cabd
)
resolve merge conflicts of cc5cabd to nyc-mr1-dev
author
Nicolas Boichat
<drinkcat@google.com>
Tue, 20 Dec 2016 19:56:55 +0000
(
03:56
+0800)
committer
Nicolas Boichat
<drinkcat@google.com>
Tue, 20 Dec 2016 20:03:39 +0000
(
04:03
+0800)
It appears
4ccc9fd56c9c0305c1cc325d2be8435cb68476e0
"Add the support to device connection via TCP/IP" was not automerged
to nyc-mr1-dev, for whatever reason, this merge also includes
that change.
Change-Id: Ifa9243f7ebc5d4ea7aa3030728a9cfe96789ab96
Trivial merge