tree e1ad9714a372ff8e7c82fa514a436c79bbf3dfc2
parent a764c778d27255c857763ff14edf3ca4d942dbd0
parent 65ab7c204b336a66f2cd8f973d38ebf919d7fe68
author Xin Li <delphij@google.com> 1598998227 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998227 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b1fb51bf9 -s ours am: a1deb32c02 -s ours am: 65ab7c204b -s ours

am skip reason: Change-Id I2cfca6da92588d8b1f41b1d6972e077991b434f3 with SHA-1 9162939341 is in history

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

Change-Id: I52146e14035a56c5b99f157cb3a17181b5d856d9