tree 559e7d2d70479757b3465d7e517e2a5778805139
parent 73607db5a17894f9eb0393aa57b4c04269a5f5ac
parent 3d4c7377362a442acfea4fd0fc47f1b0fe62b487
author Ajay Panicker <apanicke@google.com> 1474520273 +0000
committer android-build-merger <android-build-merger@google.com> 1474520273 +0000

[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

Change-Id: Ic23e1121dda4b85e5064c8d47a142da41617f321