tree 57dbad4e0f0d54fbfc017f62e6ac04b8302bdb23
parent 892fa611eafa1ecc5dec01ec27c8fc8c9b5f06cf
parent 2de3786907e8a5dbbb73bfcb18e008d3341f18b9
author Chiachang Wang <chiachangwang@google.com> 1611220786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611220786 +0000

Merge "Use ParcelFileDescriptor instead of FileDescriptor in the aidl" am: 39efdb2451 am: 2de3786907

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If57e12227a2735853911ca6271a211571ddb633b