tree 39235fe6beb6bb9f62998082cb351ef9455c1812
parent 1ff0770d7653c5451019f7a69cb8eacb3ffe6e5c
parent cb1e5872530e256ab54733c84254ed3682fdc848
author nharold <nharold@google.com> 1516184083 +0000
committer android-build-merger <android-build-merger@google.com> 1516184083 +0000

Merge "Prevent Closure of Underlying Socket FDs" am: 3cff120fcb am: 31f05d66ca
am: cb1e587253

Change-Id: I3ab796cc17d5ee2e4a2c8838bac2ada4831c755f