tree 373443ed56a7da9a842dc60adfc628a13ae0d265
parent e744aef43779247617427306f203270c6c3712b0
parent 04e2efc144904c03e7d23170a336e9a46b6502c7
author Treehugger Robot <treehugger-gerrit@google.com> 1641478140 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641478140 +0000

Merge "Remove ParcelFileDescriptor hidden API usage from IpSecService" am: ff35093684 am: 04e2efc144

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

Change-Id: Iaa93cb960dd369eeb1ad4b56ad49934d798ea2cf