tree 817765b3c52ecf732ab8259db765cc30e6978ce9
parent 4431d6cb5b891aa964fa14c1f3e6076892b05e53
parent 57fdbb97a6849cbdef21aad1a38ad3184c138648
author Ajay Panicker <apanicke@google.com> 1474493413 +0000
committer android-build-merger <android-build-merger@google.com> 1474493413 +0000

[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9  -s ours
am: 57fdbb97a6

Change-Id: I73e6ebd27ecabc7510ef9661eb1fcacdb2bafccf