commit | 7831ae00f05a8060e1db155c4d891c9a8db24437 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:24:28 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:24:28 2023 +0000 |
tree | 13b2549d87a7b1382eda3e4715990447ef923fa9 | |
parent | ae6e6de3df67ba2e4958ba803535957db9271599 [diff] | |
parent | d7994c411bfdb086baa68d41d9f26c04ab1dcd93 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 2de66c28b2 -s ours am: f37b8ee05b -s ours am: 1d94ee3f88 -s ours am: 2d0dcabe54 -s ours am: d7994c411b -s ours am skip reason: Merged-In Ic0fd578a6bba914fd181f690b8c11cd74f1b4fb3 with SHA-1 ce51ab089f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/2777037 Change-Id: Id613e1eb19b9396703fa364ddf272838e52e3386 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>