diff options
author | Sergio Giro <sgiro@google.com> | 2016-10-20 17:32:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-20 17:32:44 +0000 |
commit | fba1a1dba277746d3be0667de9eb4b98494a1963 (patch) | |
tree | 8ffc9669ccf64a7db706034ead8838c546722292 /bcprov/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java | |
parent | c6d7465b9721bf5286a0a077f94c8b349d38ff97 (diff) | |
parent | f369a5f0c5d077a5b946d7b39149cee4225d6f84 (diff) | |
download | bouncycastle-fba1a1dba277746d3be0667de9eb4b98494a1963.tar.gz |
Merge "bouncycastle: add support for PKCS5S2 algorithm parameters"android-n-mr2-preview-1
am: f369a5f0c5
Change-Id: I28f7c29a494fe6706af4db42147721f5c43369a6
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java')
0 files changed, 0 insertions, 0 deletions