tree fb1fdd19884a8e0dcd9ebd81271fbc5ea22c1e25
parent ca6100ad5f7cf01a388150c57e305bd0280bea44
parent 6a897976851f9800e3be8f69e39d3268f1c36674
author Neil Fuller <nfuller@google.com> 1484142797 +0000
committer android-build-merger <android-build-merger@google.com> 1484142797 +0000

Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb am: abc0e7765d
am: 6a89797685

Change-Id: I5920cae112e2083e1f58408cda6a257ad95fb0bc