tree 08497d8a94406b0b6c9ed7845126fbeedcd16cc0
parent 7a76772a3f68ba880cc8dee8f0dc933611750385
parent 6185866ccfbf6656a285ee53954edddb06c0ce0e
author Xin Li <delphij@google.com> 1629232381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629232381 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: c209a5602f -s ours am: 87bc94561b -s ours am: 6185866ccf -s ours

am skip reason: Merged-In I3c87188f2284ea01d0ce2697eba51c4d0a106d19 with SHA-1 e57e367bc7 is already in history

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

Change-Id: I83945bbdd0e4fc61acf66a6a1a6a9bc945bd44da