summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-10-29 17:15:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-29 17:15:11 -0700
commitb5563f7923913abc0acfaa76332dce0943e0465d (patch)
treede62e1e6537473c32012f85ea07fc1833187348c
parent390866a4396229ff489e8eafa57f643da07fd9e8 (diff)
parent595ea24b8669d38c8d9fe05319fd889654da9b21 (diff)
downloadlibcore-b5563f7923913abc0acfaa76332dce0943e0465d.zip
libcore-b5563f7923913abc0acfaa76332dce0943e0465d.tar.gz
libcore-b5563f7923913abc0acfaa76332dce0943e0465d.tar.bz2
am 595ea24b: Merge "Restore some java.security package documentation"
* commit '595ea24b8669d38c8d9fe05319fd889654da9b21': Restore some java.security package documentation
-rw-r--r--luni/src/main/java/java/security/package.html9
1 files changed, 6 insertions, 3 deletions
diff --git a/luni/src/main/java/java/security/package.html b/luni/src/main/java/java/security/package.html
index b2e7e08..a0a09f4 100644
--- a/luni/src/main/java/java/security/package.html
+++ b/luni/src/main/java/java/security/package.html
@@ -4,9 +4,12 @@
</head>
<html>
<body>
-<p>This package is for compatibility
-with legacy code only, and should not be used or expected to do
-anything useful.
+<p>
+Extensible cryptographic <i>service provider infrastructure</i> (SPI) for using
+and defining services such as {@link java.security.Certificate Certificates},
+{@link java.security.Key Keys}, {@link java.security.KeyStore KeyStores}, {@link
+java.security.MessageDigest MessageDigests}, and {@link java.security.Signature
+Signatures}.
</p>
</body>
</html>