tree 39d32705bf951e8b7ec94cdcaef1d707399ea41e
parent 0ad19476cb000ca5b3896042f3c9bc7d5dcca767
parent 7099984f4c3cb6ffa60ef1f93f143ae22187e3d9
author Nick Kralevich <nnk@google.com> 1483311595 +0000
committer android-build-merger <android-build-merger@google.com> 1483311595 +0000

Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed
am: 7099984f4c

Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1