tree 2db764a9415ce0b7161a573dc842de56a951fa3b
parent 1448a693d87b088f077e304bb57d27fa166dba4b
parent 94c08c2bedab2794c8ae7204a75b992a22032500
author Ajay Panicker <apanicke@google.com> 1474508257 +0000
committer android-build-merger <android-build-merger@google.com> 1474508257 +0000

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d  -s ours am: 7cd1668893 am: a5e128ba97
am: 94c08c2bed  -s ours

Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148