commit | 358fbd5a82146c5fc7575076fb89553aa879ef51 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:00:46 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:00:46 2023 +0000 |
tree | 971f74f6fda8afe69b443ab91f23e496cc9d0020 | |
parent | cd0caa844ac5abdcaaf5bbf08ee88686ae4fc79d [diff] | |
parent | 8554f48df437aabc8615edda8c7a75a24a1072bb [diff] |
[automerger skipped] Merge Android 14 am: 2aeb758a69 -s ours am: a2412a3d53 -s ours am: aa700daf13 -s ours am: 8554f48df4 -s ours am skip reason: Merged-In I4ae7cff7bec2d3a615c11028ad089bfa469a5c4e with SHA-1 0ab081bfe2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/2775099 Change-Id: Ieea859cb488fba1f1cb2e03a066c7ca56141d7f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>