summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2014-10-26 00:49:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-26 00:49:44 +0000
commit50ade4b28d394613ba1793ebdcc724e5ec6456ed (patch)
tree31a80832254af38041c70c2081726367b8d9d2c4
parent6d7a10281295725b14bcaccce2754051491b59dd (diff)
parent82a68225c2cff851803e189e14fba050d98e78f9 (diff)
downloadandroid_external_bouncycastle-50ade4b28d394613ba1793ebdcc724e5ec6456ed.tar.gz
android_external_bouncycastle-50ade4b28d394613ba1793ebdcc724e5ec6456ed.tar.bz2
android_external_bouncycastle-50ade4b28d394613ba1793ebdcc724e5ec6456ed.zip
am 82a68225: am bd63be61: am 9454cc5f: Merge "Avoid things that cause CertBlacklist to be preinitialized"
* commit '82a68225c2cff851803e189e14fba050d98e78f9':
0 files changed, 0 insertions, 0 deletions