projects / platform / upstream / VK-GL-CTS.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01c922f cc5cabd)
resolve merge conflicts of cc5cabd to nyc-mr1-dev
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 19:56:55 +0000 (03:56 +0800)
committerNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 20:03:39 +0000 (04:03 +0800)
commit7a338a6626d7eee070c841bd2227d4eed280f078
treedfda162015558612e4e4f268499b5941b5451f52tree | snapshot
parent01c922fc267ea41cc1c6cb83cde7ba6da200dc38commit | diff
parentcc5cabd6337fd119c3770872ee8829f74e5c9ed3commit | diff
resolve merge conflicts of cc5cabd to nyc-mr1-dev

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
Domain: Graphics System / GL;