diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-01 14:37:23 +0000 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2016-02-01 15:16:12 +0000 |
| commit | 397d32894b89b506dc318e0f83446187c9b76ebe (patch) | |
| tree | 8229ff72c8cbb06f49dce3a8382930919fa6fc2b /bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html | |
| parent | 9b30eb05e5be69d51881a0d1b31e503e97acd784 (diff) | |
| parent | 6d876f3f0ae553704a1dcf7e89003fcf14717037 (diff) | |
| download | android_external_bouncycastle-397d32894b89b506dc318e0f83446187c9b76ebe.tar.gz android_external_bouncycastle-397d32894b89b506dc318e0f83446187c9b76ebe.tar.bz2 android_external_bouncycastle-397d32894b89b506dc318e0f83446187c9b76ebe.zip | |
Merge remote-tracking branch 'aosp/upstream-master' into merge-152-from-upstream
As to set a common ancestor for future merges from aosp/upstream-master
(when updating to new versions of bouncycastle).
We'll override all the changes of this commit with patch
https://android-review.googlesource.com/#/c/199872
Change-Id: I53a7f797b520a6e119878dbae53246cdcc585ddf
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html new file mode 100644 index 0000000..fa411ec --- /dev/null +++ b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html @@ -0,0 +1,5 @@ +<html> +<body bgcolor="#ffffff"> +Support classes for the ISIS-MTT X.509 Certificate Extensions. +</body> +</html> |