OSDN Git Service

Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets...
authorAjay Panicker <apanicke@google.com>
Fri, 23 Sep 2016 00:52:41 +0000 (00:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 00:52:41 +0000 (00:52 +0000)
am: 0cc5cc4e6e  -s ours

Change-Id: I2805104c0bf2a19d874167fb4157b377f9ec3f72


Trivial merge