tree 9a29ba8da246a55b66684c63f1e21a956138d555
parent c20376b2a04b2779df4571f76bcb1cc1aae420fb
parent 6ffdf43ec35dbcc96f5a62dddd167b7353a0ab84
author Ajay Panicker <apanicke@google.com> 1474574264 +0000
committer android-build-merger <android-build-merger@google.com> 1474574264 +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 am: f6d8037708 am: 90eafb5322  -s ours am: b2a1dcb913
am: 6ffdf43ec3

Change-Id: Id58741db4a95f6cb381531d3b9d9a2a9ce67350e