tree bfcc50e251ee58c1642c8eae095e4dfccd0ca2c0
parent abf4ca362f116fb869d85448b646238ac1786c21
parent ff2c7ffe37e1ae7f6f024ddf64e097d357221d91
author Xin Li <delphij@google.com> 1598552606 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598552606 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: ff2c7ffe37 -s ours

am skip reason: Change-Id Ia6bb481d2cc9e14976aab45042881f277d6763ca with SHA-1 643b460fb6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bouncycastle/+/12469573

Change-Id: I81d4becf9413f843a02d608300ad5714ee3d01d4