Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a am: 8e172c638d -s ours am: 9338ffa148 am: 5732e9dbc3" into nyc-mr1-dev-plus-aosp

am: 6ca8883b50  -s ours

Change-Id: I049b2cbd5f37c829b8eaa657e7ca6bd6680c8512
This commit is contained in:
Ajay Panicker
2016-09-23 00:44:34 +00:00
committed by android-build-merger

Diff Content Not Available