| commit | 003504a413fff9d6457eb4e2c7a61149bc227487 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 30 16:50:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 30 16:50:53 2015 +0000 |
| tree | 985e8c775190079fbaf621b37aa1738d1446a4d5 | |
| parent | b0f13dc4be7b8630afc47390708f16cf42a38879 [diff] | |
| parent | 588fffc23efa3f270044ab3a14c32a45fd84fdf0 [diff] |
am 588fffc2: am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev * commit '588fffc23efa3f270044ab3a14c32a45fd84fdf0': AndroidKeyStore keys should not be handled by Bouncy Castle.