tree 63d1cd5e18b5bbb34e19116363600e08b0516096
parent c6021f02b5630b9a3248145b6a915ea5b9361cfd
parent 31f05d66cae9051b0c90b248f98307c2a7de68d2
author nharold <nharold@google.com> 1516183371 +0000
committer android-build-merger <android-build-merger@google.com> 1516183371 +0000

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

Change-Id: I1ecac95dc1c4be573d5411a335f94c6a6511d4bd