commit | 7a168a43fbdf4d4c232bb50b98a93bddd766ab1f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:04:50 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:04:50 2023 +0000 |
tree | eda4f3a382040dc9994a92deb156f345ba5718f9 | |
parent | 543601262a684ce7450c05c790d1452d5ce3d5d2 [diff] | |
parent | bc33139a945bfe60c2fbe116db38753b02aa67fe [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 1a60e36aef -s ours am: bc33139a94 -s ours am skip reason: Merged-In I35fc8e992d98bd1126bb6c7673d9561b6c9c32e8 with SHA-1 406ed7913d is already in history Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2775063 Change-Id: I323a4b34674f984513a9ff1da7e1cf2d37c3abf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>