tree 63eb3783d9697afa57a2f7836da38e217251c524
parent 8aed775e73fbcd837963b791c11fc4261febe667
parent a1f96c0af832870a12c776da3f621180ba332496
author Steven Moreland <smoreland@google.com> 1549996098 -0800
committer android-build-merger <android-build-merger@google.com> 1549996098 -0800

Merge "Remove ParcelFileDescriptor.aidl" am: c7c7fe6325 am: 21f4e04f3d
am: a1f96c0af8

Change-Id: I8ee7c8ae5e66ceb7a9f12e8def48ebdd1dedaa18