tree 4d707d8e0b97dc645f63103228c37e96dfd89dea
parent b07381120c4fe0a3f36a9f26965a505b0995e0a4
parent 94645f3065c7d5000e2846e711c8595494bc19ba
author Xin Li <delphij@google.com> 1633679783 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679783 +0000

[automerger skipped] Merge "Merge Android 12" am: 9f0772b75c -s ours am: 8b7cad2199 -s ours am: 94645f3065 -s ours

am skip reason: Merged-In I2ef210ed313638afa9db8004f1ebbf5508d06911 with SHA-1 99ac1aedba is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/1847324

Change-Id: Ibfc6bb9bceba8d08af521959838dc56fe8db7797