tree e4afd14ec6f6b824e5d7e7abbdac8b5074215cd6
parent c3400414d2ace90f4bffe1245b6310d9bcdf9bc0
author Jesse Wilson <jessewilson@google.com> 1251758234 -0700
committer Jesse Wilson <jessewilson@google.com> 1251758234 -0700

Update crypto package to Harmony r802921. Only Javadoc changes.

commit d5d4307b5b9f37e6f66ab1273be1acd2a29177de
Merge: 2c2287b 1c60d7c
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 15:36:46 2009 -0700

    Merge branch 'crypto_802921' into crypto_dalvik

    Conflicts:
    	libcore/crypto/.classpath
    	libcore/crypto/build.xml
    	libcore/crypto/src/main/java/javax/crypto/BadPaddingException.java
    	libcore/crypto/src/main/java/javax/crypto/Cipher.java
    	libcore/crypto/src/main/java/javax/crypto/CipherInputStream.java
    	libcore/crypto/src/main/java/javax/crypto/CipherOutputStream.java
    	libcore/crypto/src/main/java/javax/crypto/CipherSpi.java
    	libcore/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
    	libcore/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
    	libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java
    	libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
    	libcore/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java
    	libcore/crypto/src/main/java/javax/crypto/KeyAgreement.java
    	libcore/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java
    	libcore/crypto/src/main/java/javax/crypto/KeyGenerator.java
    	libcore/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java
    	libcore/crypto/src/main/java/javax/crypto/Mac.java
    	libcore/crypto/src/main/java/javax/crypto/MacSpi.java
    	libcore/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java
    	libcore/crypto/src/main/java/javax/crypto/NullCipher.java
    	libcore/crypto/src/main/java/javax/crypto/SealedObject.java
    	libcore/crypto/src/main/java/javax/crypto/SecretKey.java
    	libcore/crypto/src/main/java/javax/crypto/SecretKeyFactory.java
    	libcore/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java
    	libcore/crypto/src/main/java/javax/crypto/ShortBufferException.java
    	libcore/crypto/src/main/java/javax/crypto/interfaces/DHKey.java
    	libcore/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
    	libcore/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java
    	libcore/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java
    	libcore/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/PSource.java
    	libcore/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
    	libcore/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java

commit 2c2287b521cc5f558d9929e14e31ec92da6285b1
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 14:56:45 2009 -0700

    crypto_dalvik

commit 1c60d7c222c55ae49add8345a192c54357bb4a1f
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 14:56:34 2009 -0700

    crypto_802921

commit 50cf7f5d97de2f65ee0769aafec7b5a3551cb5d0
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 14:56:27 2009 -0700

    crypto_527399