commit | 421e187c171b601a7a1be029b54fba003bfec1fe | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:19:50 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:19:50 2023 +0000 |
tree | 6fdee4104a5649e703ba63185fecc765f97e0d9d | |
parent | b39a50301e72cf98664b70fe609d1d2a84b61a36 [diff] | |
parent | 97acafa5cc21badeef51d7f3ed84f1a0911fa0a3 [diff] |
[automerger skipped] Merge Android 14 am: 930e27bad9 -s ours am: c3accd41a0 -s ours am: 5d0cca0f33 -s ours am: 56f1b2c628 -s ours am: 97acafa5cc -s ours am skip reason: Merged-In I6f2adc199e9f511b63231ce1ff9558375234712a with SHA-1 f73fc36823 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/vndk/v34/+/2777129 Change-Id: Icdbcfe23cc134e76bfd58b5f43ad7c267a0ed673 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>