summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2014-10-26 00:49:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-26 00:49:44 +0000
commit6d7a10281295725b14bcaccce2754051491b59dd (patch)
tree31a80832254af38041c70c2081726367b8d9d2c4
parent679bffe6c61b8318dfefd7b9d854c9cca7c378fe (diff)
parentc0144d74606fbaa25f4f5a9a3a66deaf232bd418 (diff)
downloadandroid_external_bouncycastle-6d7a10281295725b14bcaccce2754051491b59dd.tar.gz
android_external_bouncycastle-6d7a10281295725b14bcaccce2754051491b59dd.tar.bz2
android_external_bouncycastle-6d7a10281295725b14bcaccce2754051491b59dd.zip
am c0144d74: am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""
* commit 'c0144d74606fbaa25f4f5a9a3a66deaf232bd418':
0 files changed, 0 insertions, 0 deletions