summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-03-27 18:49:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 18:49:14 +0000
commit8926a7f4cdbe241f9baca93b910cb10942ed38be (patch)
tree2e7b3d1017b49e6eac5c09a733c3a63e03a4b562
parent57c3bb556ef873a72010d6022edddc14e6bba9be (diff)
parent11b9edd9ad20788db0903e20dd50bbbc499556fb (diff)
downloadandroid_external_bouncycastle-8926a7f4cdbe241f9baca93b910cb10942ed38be.tar.gz
android_external_bouncycastle-8926a7f4cdbe241f9baca93b910cb10942ed38be.tar.bz2
android_external_bouncycastle-8926a7f4cdbe241f9baca93b910cb10942ed38be.zip
am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\' into jb-mr1-dev
* commit '11b9edd9ad20788db0903e20dd50bbbc499556fb': Add certs to blacklist.
0 files changed, 0 insertions, 0 deletions