OSDN Git Service

Merge "Don\'t leak sockets if setsockopt() or fchown() fail." am: 192539f524
authorErik Kline <ek@google.com>
Wed, 9 Mar 2016 05:07:56 +0000 (05:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Mar 2016 05:07:56 +0000 (05:07 +0000)
commit0639bd50d235abd9cbe2042a4ea80b3ce0c53eb4
tree6d2b44c6d23d99f81b4a9ab8ecf3c4574edca96a
parentaf2c6e771c29407c35b55d9b1c5327286dfabd8e
parentb2727d8fa66d06945481aafacbfbd82f717212e3
Merge "Don\'t leak sockets if setsockopt() or fchown() fail." am: 192539f524
am: b2727d8fa6

* commit 'b2727d8fa66d06945481aafacbfbd82f717212e3':
  Don't leak sockets if setsockopt() or fchown() fail.