tree ec95192d2edb69e4ec0e40832569b769428cd1c2
parent ead17a3afdb8dcab329e563c6ec8307f4298d2b8
parent b5b69a2004789b3ccabd635280a0f9f0b01f62c2
author Ajay Panicker <apanicke@google.com> 1474584481 +0000
committer android-build-merger <android-build-merger@google.com> 1474584481 +0000

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c  -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc  -s ours am: 916552b0c9
am: b5b69a2004

Change-Id: Ie644851845a7187f7062f1b6d616eb7bb6fd7308