summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2014-10-25 19:52:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-25 19:52:28 +0000
commitc0144d74606fbaa25f4f5a9a3a66deaf232bd418 (patch)
tree31a80832254af38041c70c2081726367b8d9d2c4
parent312be53972dcae0167dabdd548bccfabe3ff1189 (diff)
parent4b898d5f5daafae7f3eae2951da07a9c1c608887 (diff)
downloadandroid_external_bouncycastle-c0144d74606fbaa25f4f5a9a3a66deaf232bd418.tar.gz
android_external_bouncycastle-c0144d74606fbaa25f4f5a9a3a66deaf232bd418.tar.bz2
android_external_bouncycastle-c0144d74606fbaa25f4f5a9a3a66deaf232bd418.zip
am 4b898d5f: am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""
* commit '4b898d5f5daafae7f3eae2951da07a9c1c608887':
0 files changed, 0 insertions, 0 deletions