commit | 1be2f3da911aa4e15ca3b0c9486b285ab363abca | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Mar 07 09:58:32 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 09:58:32 2024 +0000 |
tree | 6b682d271b612f7ab0f8fbf3635fc1e48aa51f69 | |
parent | 12cb95c0a48bf77c69ed20c001ddc723810efa17 [diff] | |
parent | 8bce44e08bbc3d3f61161fb7266106d893709971 [diff] |
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 8bce44e08b -s ours am skip reason: Merged-In I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 with SHA-1 2e555bb246 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2990861 Change-Id: I5e7ec703d0d22a1ebab09182ea3bfe5a5c5cd3ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>