OSDN Git Service

Merge "Prevent Closure of Underlying Socket FDs" am: 3cff120fcb
authornharold <nharold@google.com>
Wed, 17 Jan 2018 10:02:51 +0000 (10:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Jan 2018 10:02:51 +0000 (10:02 +0000)
commitcb1e5872530e256ab54733c84254ed3682fdc848
tree63d1cd5e18b5bbb34e19116363600e08b0516096
parentc6021f02b5630b9a3248145b6a915ea5b9361cfd
parent31f05d66cae9051b0c90b248f98307c2a7de68d2
Merge "Prevent Closure of Underlying Socket FDs" am: 3cff120fcb
am: 31f05d66ca

Change-Id: I1ecac95dc1c4be573d5411a335f94c6a6511d4bd