tree af9a51bb92f669c2970e03c8d212d4da6b2338d4
parent 6b5f966c2f93d65d43d8d98d1fdad037f61fb4a1
parent 4a1b8d7aba0886c63631b879218b2fd692c12bef
author Ajay Panicker <apanicke@google.com> 1474582120 +0000
committer android-build-merger <android-build-merger@google.com> 1474582120 +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

Change-Id: I5fa0202b264c224a155b89167cf7a1e3928854c6