OSDN Git Service

Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53
authorAjay Panicker <apanicke@google.com>
Fri, 6 Jan 2017 01:46:10 +0000 (01:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 01:46:10 +0000 (01:46 +0000)
am: d76576b6d1

Change-Id: I0b59b10a095bf23d4f26856690bf6be2a5304cbc


Trivial merge