summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kenny Root <kroot@google.com> 2013-12-13 01:19:59 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2013-12-13 01:19:59 +0000
commit87ec50914cdd290ad5486adad01cfad4a0b9f59d (patch)
tree6dc5d11f8dee9f5459844e0e19f0a0e84a2b2287
parent9c514b8fe98603072e66cd44744cd1b42e28e678 (diff)
parent2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3 (diff)
am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
* commit '2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3': Add GCMParameterSpec to preloaded-classes
-rw-r--r--preloaded-classes1
1 files changed, 1 insertions, 0 deletions
diff --git a/preloaded-classes b/preloaded-classes
index 960c8ac018a4..98b9e73abe3a 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -2299,6 +2299,7 @@ javax.crypto.CipherSpi
javax.crypto.KeyAgreementSpi
javax.crypto.MacSpi
javax.crypto.SecretKey
+javax.crypto.spec.GCMParameterSpec
javax.crypto.spec.IvParameterSpec
javax.crypto.spec.SecretKeySpec
javax.microedition.khronos.egl.EGL