OSDN Git Service

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 22 Sep 2016 22:10:17 +0000 (22:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Sep 2016 22:10:20 +0000 (22:10 +0000)
commit5b396853fb62b374302879653d1785af85c39232
tree379fd80a57a4faab52fa52382a74899c2324220a
parentf8033cb4f9df6ee6fac1deb9e9db3c1e8ede557e
parent5d5815dc291f0b242578de880222482bad917114
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9  -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157  -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322  -s ours am: b2a1dcb913 am: 6ffdf43ec3 am: 5fc21fdbcc am: b2e88d0cb9" into nyc-mr1-dev-plus-aosp