OSDN Git Service

Merge changes Ib0ab1722,Id5b1b351
authorLorenzo Colitti <lorenzo@google.com>
Fri, 18 Dec 2015 19:27:30 +0000 (11:27 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Dec 2015 19:27:30 +0000 (11:27 -0800)
commit108eef5e2d56f572a9dca0365195a295def1c9be
treee44b184b9eb84b430fc0fdc55e72660ff95cd313
parente08de37c7a3d23901a86948f78afe74ce00f2b68
parentabf5656527ec767fdf306fbf703f73a10e4ae3d6
Merge changes Ib0ab1722,Id5b1b351
am: abf5656527

* commit 'abf5656527ec767fdf306fbf703f73a10e4ae3d6':
  Don't create TIME-WAIT sockets in CreateSocketPair.
  Add support for the sock_diag netlink interface.