tree f62c13330976e3f2afffd2866afeefba999308b7
parent 68d32f3257e11bf815f29e5e5e9931a52a4558de
parent 93eca9291490fc251574ce65f802970bfb79b03d
author Xin Li <delphij@google.com> 1697759689 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697759689 +0000

[automerger skipped] Merge 10952656 am: 5570bbf78a -s ours am: 93eca92914 -s ours

am skip reason: Merged-In I3320382b65fcd1fceeb969dd5122c80a6221e4ca with SHA-1 5653bad6a5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/abi-dumps/vndk/+/25090726

Change-Id: If8c2c6f306650eb2becd404afed623b3128654a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>