commit | d78e0d9ebbb318f7a8737344c08d594f34b78e8a | [log] [tgz] |
---|---|---|
author | Pete Bentley <prb@google.com> | Wed Aug 19 18:41:19 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 19 18:41:19 2020 +0000 |
tree | 9a3e52d1e33f3656e0635f0ed7310c653ec3f1ff | |
parent | 2d4c5a69393a80ba30d6adacf2fe4d0c1cb4c318 [diff] | |
parent | 6d618a826fe6537e24ad8ad5b1b6f121ff08771f [diff] |
Merge changes from topic "certblocklist" am: c251ff6d14 am: 6d618a826f Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1380341 Change-Id: Ic08d3886c839acdae8b3c87ed71ae46ea5f0cf5c