commit | 6210e332f124c346396b82554e42ae4805bd4282 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Fri Dec 13 01:22:44 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 13 01:22:44 2013 +0000 |
tree | 212878cebd4decc84ef5d06560c41f84a11fec71 | |
parent | e21734755666775deafcf26e8eb9c4388c9e1ed0 [diff] | |
parent | 87ec50914cdd290ad5486adad01cfad4a0b9f59d [diff] |
am 87ec5091: am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" * commit '87ec50914cdd290ad5486adad01cfad4a0b9f59d': Add GCMParameterSpec to preloaded-classes