summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-03-27 19:16:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 19:16:10 +0000
commit79c4cebc42ee833dfbc225a999bed0054eb7bb53 (patch)
tree862641c228598821eecbda1022b7dec3c29cf83d
parent159b0cd9f2887d90ec296259527abb5ba58a88df (diff)
parentc7d8bdf84b03bcf893835468ff37dffd7b134b68 (diff)
downloadandroid_external_bouncycastle-79c4cebc42ee833dfbc225a999bed0054eb7bb53.tar.gz
android_external_bouncycastle-79c4cebc42ee833dfbc225a999bed0054eb7bb53.tar.bz2
android_external_bouncycastle-79c4cebc42ee833dfbc225a999bed0054eb7bb53.zip
am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\' into jb-mr1-dev
* commit 'c7d8bdf84b03bcf893835468ff37dffd7b134b68': Add certs to blacklist.
0 files changed, 0 insertions, 0 deletions