tree dcb56acacba81eb9511d6b04be1c6be020446568
parent 18df3efd1de994c0f290db8e00337ef628b8ea67
parent 108d1eedb231b6463f686610b15f10afbf664b56
author Ajay Panicker <apanicke@google.com> 1474590711 +0000
committer android-build-merger <android-build-merger@google.com> 1474590711 +0000

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9  -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9  -s ours am: 745254f98b am: d91f2f4d2b am: c20376b2a0 am: 4a1b8d7aba
am: 108d1eedb2  -s ours

Change-Id: Ic8449ba1aae1847a179d447b283d296e38862e89