Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev

am: 2c2f8acdab Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c
2016-06-15 01:05:26 +00:00
parent 8d129efa23 2c2f8acdab
commit 2da8166a68
1 changed files with 0 additions and 5 deletions
--- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java
+++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
@@ -582,11 +582,6 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec {
     *
     * @see Builder#setAttestationChallenge(byte[])
     */
-    /*
-     * TODO(swillden): Update this documentation to describe the hardware and software root keys,
-     * including information about CRL/OCSP services for discovering revocations, and to link to
-     * documentation of the extension format and content.
-     */
    public byte[] getAttestationChallenge() {
        return Utils.cloneIfNotNull(mAttestationChallenge);
    }