tree 333780a7c49463032ef78aeaef751362883acfee
parent 438cc52ca1e3c8835967e4e7281bad4c3e251eab
parent 35d1b45b0fe02624b64da24cd3b6d6397cb232a1
author Ajay Panicker <apanicke@google.com> 1474495009 +0000
committer android-build-merger <android-build-merger@google.com> 1474495009 +0000

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4
am: 35d1b45b0f

Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a