commit | 2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Fri Dec 13 01:16:45 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 13 01:16:45 2013 +0000 |
tree | b3e7a010e6b0d7a1f645fe2e89c5cb8540a17f3c | |
parent | 4561f1990def36aef17dbb35511a1522195e7f95 [diff] | |
parent | 2a288babaef57308e042ed97caea6b49c8ae5033 [diff] |
am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" * commit '2a288babaef57308e042ed97caea6b49c8ae5033': Add GCMParameterSpec to preloaded-classes