tree caa4f62c799be957db45d8bf75f11f29f90c098c
parent 2ac83618cab5dfb85b4fd39e2f50724aa3d491e0
parent 8ab1fe5e4050b8c12f2e4a293b01b02d379b2187
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582060113 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582060113 +0000

Merge "Add AParcel_getAllowFds()" am: ed2364a85d am: 8ab1fe5e40

Change-Id: I3866237bd7d7e54b311677bf69cc0e2d9a7037b7