OSDN Git Service

Merge changes I035cd9b6,I8ca9f205
authorLorenzo Colitti <lorenzo@google.com>
Fri, 22 Jan 2016 03:40:06 +0000 (03:40 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 22 Jan 2016 03:40:06 +0000 (03:40 +0000)
commit40fded7e6a300657d5f71f52a43d673a2f3f7446
tree0f0a92a00624c32b113b6bd80d17445e632662c6
parenta17fc6dab29c28244d7d5515db67822c18b62b58
parentdfa6374100c934a21fdfcae7a8be9359b9c3e72c
Merge changes I035cd9b6,I8ca9f205

* changes:
  Make the SOCK_DESTROY tests work again.
  Make CloseSocketFromFd work on mapped sockets too.