tree 2db764a9415ce0b7161a573dc842de56a951fa3b
parent 22c9458a13bf55179a3b2b6779086db3a61afb81
parent 8be4dc7e16d2a90bf13eb21dfdab04ef9608a72c
author Ajay Panicker <apanicke@google.com> 1474508091 +0000
committer android-build-merger <android-build-merger@google.com> 1474508091 +0000

[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1
am: 8be4dc7e16  -s ours

Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4