tree bba88b50159e2f784782157258e3f28b5a7bd266
parent 5297dba712390931c110cee959093412dc1bee70
parent 9156ccdbb481a09becab4157a2eb5e7535f62cc0
author Nick Kralevich <nnk@google.com> 1483310600 +0000
committer android-build-merger <android-build-merger@google.com> 1483310600 +0000

Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
am: 9156ccdbb4

Change-Id: I1501dce93ba090237831bf4c777cea13870f393d