tree 6825428c194b387637e46615050c68386ccf7939
parent d837ed2c996652a4bb6634bf5043faa71800da02
parent 5a35ec90bf1641e80b73652fd305fafcda4ff89b
author Nick Kralevich <nnk@google.com> 1483312111 +0000
committer android-build-merger <android-build-merger@google.com> 1483312111 +0000

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

Change-Id: Ia485c5cadc25a3e83a881132faacd6a0be104877