OSDN Git Service

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
authorAjay Panicker <apanicke@google.com>
Fri, 23 Sep 2016 00:33:28 +0000 (00:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 00:33:28 +0000 (00:33 +0000)
commit1dc46f9e5645a0432812d5c5c6b2c97fd4aaecf0
treedcb56acacba81eb9511d6b04be1c6be020446568
parentc144b64d8076a259f1b8b97d82d3d64f3c58e453
parent5b396853fb62b374302879653d1785af85c39232
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9  -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157  -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322  -s ours am: b2a1dcb913 am: 6ffdf43ec3 am: 5fc21fdbcc am: b2e88d0cb9" into nyc-mr1-dev-plus-aosp
am: 5b396853fb  -s ours

Change-Id: Ifeadce2529ac49fafb1a1f877b9c3e3cbbd75389