tree 24da872ed32f4dfea62eadb36ad0bce3f265df8d
parent 43342253fe7278755a0f9fe1960c1d0df61cbc6c
parent 07ef9e0b318b5d69e33853ce6f6b1d3e3869f3a4
author Almaz Mingaleev <mingaleev@google.com> 1615471741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615471741 +0000

Merge "Do not accept null password in PKCS12KeyStoreSpi#engineStore." am: 28da8c1313 am: b4d2aa4fad am: 07ef9e0b31

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4680afa52638dab0713bcc3bec06a00538698df4