tree 817765b3c52ecf732ab8259db765cc30e6978ce9
parent 46442d1be1d018ba83055deb128dc5f44745948f
parent 447ac4b31d6faa9e3411bb93be2dc3d31b5072df
author Ajay Panicker <apanicke@google.com> 1474492535 +0000
committer android-build-merger <android-build-merger@google.com> 1474492535 +0000

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
am: 447ac4b31d

Change-Id: I939008cb6b770c4273e258d91e2916a1823ec6fb