tree d3f5fca1312986af0f2c6e9136f6e8c0f3f192f8
parent 7f463497f2bc069e578fee24ce2e34dc20980f50
parent bcceea173f3e6c053739e23a7f04b2eeccc87fde
author Xin Li <delphij@google.com> 1633679808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679808 +0000

[automerger skipped] Merge Android 12 am: ce8144a33e -s ours am: 9fc901b8d6 -s ours am: bcceea173f -s ours

am skip reason: Merged-In Ia0563707c50e37047031f278c89f590eeff2c1cc with SHA-1 82acd5f945 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/1847706

Change-Id: Id240d22209f728b61f5f57ef03662b5ab0129b7f