| commit | 2e0e748f10e12e95ea81d118a425ce8070621201 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Jun 16 22:04:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 16 22:04:53 2015 +0000 |
| tree | 24f75a39f93c6bd3bb782a3ce8d71028adf3ad46 | |
| parent | d2acb164dd005143d6a2c8e90c394d0bf8e355f7 [diff] | |
| parent | 686e1b97aad2be441a71eafcf7608ddf91c69fb8 [diff] |
am 686e1b97: am 301e99a0: am 4f131667: Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev * commit '686e1b97aad2be441a71eafcf7608ddf91c69fb8': Harden and clean up KeyGenParameterSpec.