tree 87e9b9defa49e06c8ecc712ddca0c94756c5dc88
parent d8993b54958561e2b1d325a4fd47ca3bcf30081d
parent db15177cf7264a914c4472d6a3e0292c14207e70
author Luke Huang <huangluke@google.com> 1543991732 -0800
committer android-build-merger <android-build-merger@google.com> 1543991732 -0800

Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: d6c2dc5908
am: db15177cf7

Change-Id: I8b89e88d1db96581ab91d649e5af621c499669ed