tree aa3b9d7def483dcbb554baffe7e0b2c90bbb81cb
parent 4d3caf3938e5126a3dacc51daab869a5ffd6ca2e
parent e0211af8674a0288edfaafeaa6bde4278023e363
author Ajay Panicker <apanicke@google.com> 1483667403 +0000
committer android-build-merger <android-build-merger@google.com> 1483667403 +0000

Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1
am: e0211af867

Change-Id: I5ac57ca6439359fc65622254090a3ea6cc2aec18