commit 2a288babaef57308e042ed97caea6b49c8ae5033
author Kenny Root <kroot@google.com> Thu Dec 12 17:13:38 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 12 17:13:38 2013 -0800
tree 16fd74e4ba311c4538c9458dd9a2e67716653a10
parent 08e0142fb72cf08a5784b20d42d18bf7a35370cf
parent fc2f459c522448331b79c388e9f7b19f72650586

am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"

* commit 'fc2f459c522448331b79c388e9f7b19f72650586':
  Add GCMParameterSpec to preloaded-classes

preloaded-classes

diff --git a/preloaded-classes b/preloaded-classes
index 960c8ac..98b9e73a 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -2299,6 +2299,7 @@
 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