tree 2db764a9415ce0b7161a573dc842de56a951fa3b
parent a70fffe8e78ae599252f9d3d56e4f4c8ee9090ee
parent 9c7ac981573d0e764a5cd05c911f462d76cd58ff
author Ajay Panicker <apanicke@google.com> 1474508201 +0000
committer android-build-merger <android-build-merger@google.com> 1474508201 +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

Change-Id: I3bc0085154ca14e3bee294de6109e41e1ccd9fa5