tree 7210cc51d7e19b5cfa52509503cc6f76d035701c
parent 72d9008700a9ccb6d94b8594d41c15054539048d
parent 4400fb5bed37b7ffa29c68561a33c66766cf347a
author Nick Kralevich <nnk@google.com> 1483311083 +0000
committer android-build-merger <android-build-merger@google.com> 1483311083 +0000

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

Change-Id: I2d0f491b2f5f814aa92749a2f5d1130393cd1a83