tree 08497d8a94406b0b6c9ed7845126fbeedcd16cc0
parent d1ffb240c965cbd7be4da598b31da1a96bba5a78
parent 982d540adedd043233d77952dde9c431292c3a84
author Xin Li <delphij@google.com> 1633681811 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681811 +0000

[automerger skipped] Merge Android 12 am: 5807542208 -s ours am: 92133cae77 -s ours am: c661274424 -s ours am: 982d540ade -s ours

am skip reason: Merged-In I5858ea02ccf1ff6e74acb641c37d2733b9c5bc18 with SHA-1 c209a5602f is already in history

Original change: https://android-review.googlesource.com/c/platform/system/ca-certificates/+/1847916

Change-Id: I8e6c87659db17c18c1037a2b91707e32e026e9f6