| commit | 87ec50914cdd290ad5486adad01cfad4a0b9f59d | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Dec 13 01:19:59 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 13 01:19:59 2013 +0000 |
| tree | 6dc5d11f8dee9f5459844e0e19f0a0e84a2b2287 | |
| parent | 9c514b8fe98603072e66cd44744cd1b42e28e678 [diff] | |
| parent | 2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3 [diff] |
am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" * commit '2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3': Add GCMParameterSpec to preloaded-classes