commit | 33f466b2e1a1be346e853c443b0fe172b8435684 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 23:00:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 23:00:31 2023 +0000 |
tree | 0760745e3a0ca4a7d6e3fbbc4d355706c4f745b2 | |
parent | bcad324d75eb067311fd55d8d393d80e44e2c36d [diff] | |
parent | 0c9fc0d14b73bd46bb1940180cfce8b5a0b02810 [diff] |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ab30aeac7a -s ours am: f41822f975 -s ours am: 0c9fc0d14b -s ours am skip reason: Merged-In I5d8b2acf5aa30bbd4a3ace64d766e2475419e01c with SHA-1 4df1a75313 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/2863432 Change-Id: Iea7f7102c337b31ba9a65b60e5912c9e92803837 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>