commit | 47f3bad4ef9d9a0eaf3481ed74bdb8e8a06bf76d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 21:19:54 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 21:19:54 2023 +0000 |
tree | afe6b90ee732c0dd91702da1e0f80c263b20ac99 | |
parent | 872ecc3e9539b1b9f35578453321e4d497221218 [diff] | |
parent | 4f68c72394041603bf47bba0b5ba7af53424179a [diff] |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4f68c72394 -s ours am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: I0f3a6758b7e2cc5a923b211794c0ca3e2ebcb2f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>