commit | e7141dd59c578b82a729b267217aa1f26a6ac5e2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:56:22 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:56:22 2023 +0000 |
tree | 906c22e4776b98f5e3b352e53719395d8dff7d13 | |
parent | 36c661f89dc8e5044a9e567e431e7e19c1112afc [diff] | |
parent | 7a168a43fbdf4d4c232bb50b98a93bddd766ab1f [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 1a60e36aef -s ours am: bc33139a94 -s ours am: 7a168a43fb -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: I711ea76c0939c7b8ecac6b22105a0deccc5a1530 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>