From: Lorenzo Colitti <lorenzo@google.com>
Date: Fri, 18 Dec 2015 06:02:06 +0000 (+0000)
Subject: Merge changes Ib0ab1722,Id5b1b351
X-Git-Tag: android-x86-8.1-r1~569^2~40
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=abf5656527ec767fdf306fbf703f73a10e4ae3d6;p=android-x86%2Fsystem-extras.git

Merge changes Ib0ab1722,Id5b1b351

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

abf5656527ec767fdf306fbf703f73a10e4ae3d6