commit | 3daef4db8939be6828225bc8014f826dfb604944 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:19:50 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:19:50 2023 +0000 |
tree | 30c677f7caa5354b68e04ccadd3e79c3122dd9ca | |
parent | 4e234630aa14962e778ce8fe1b8e5ea59a4305ee [diff] | |
parent | 26b6ec202bbf545f217ff8e2bbfb91b36d8added [diff] |
[automerger skipped] Merge Android 14 am: 35561cdc95 -s ours am: 9e9c79da42 -s ours am: f4bb2f7590 -s ours am: d7c94f147f -s ours am: 26b6ec202b -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I4a14ab80128f435782cc74fd7fa6713b43dbe394 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>