tree d3f5fca1312986af0f2c6e9136f6e8c0f3f192f8
parent 5707926a5d3d432d3b93760786f9d3a167f12c5c
parent 1ca237664cf529ceb3b87f9639337c2691258b18
author Xin Li <delphij@google.com> 1629246236 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246236 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 82acd5f945 -s ours am: 5b1259ade8 -s ours am: 7f463497f2 -s ours am: 1ca237664c -s ours

am skip reason: Merged-In I24fb9c25522accfc4354d176207a9851dd018a3b with SHA-1 2b76118ddf is already in history

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

Change-Id: I1bc1a9b80307a771aef7e6eeb0c83aa777dfd158