| commit | f46be3254aeaa1272354b3f04b921184768d53ba | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 07 10:49:50 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 10:49:50 2024 +0000 |
| tree | f8964ff7078a68dc81ffccdb84c48c4bf2a99137 | |
| parent | ee9fd78417e1f63202fedbf470fefe751415b9de [diff] | |
| parent | 1be2f3da911aa4e15ca3b0c9486b285ab363abca [diff] |
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 8bce44e08b -s ours am: 1be2f3da91 -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: I0b78cf3a81ff27b895822a1aa2e9e8d7109a3c94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>