tree 54eafa11846b6dd8924b415144512db041ae4d04
parent f2074ea62a35f82fd87420b3b42f243b34d4c401
parent 3cff120fcb256969292b5d8a2f2071aa6f834e2b
author nharold <nharold@google.com> 1516182469 +0000
committer android-build-merger <android-build-merger@google.com> 1516182469 +0000

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

Change-Id: I2f8e445f9a12e95cf8d81d63e02fad7ecc17ad36