OSDN Git Service

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
authorAjay Panicker <apanicke@google.com>
Thu, 22 Sep 2016 19:56:50 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 19:56:50 +0000 (19:56 +0000)
am: 0ec10c8fdc  -s ours

Change-Id: I66bfa158fdf948f36a98c20c3afc7ee7d73bb920


Trivial merge