summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-03-27 19:25:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 19:25:42 +0000
commitc50b2c590028111b7d74492c3bead4afedf7d070 (patch)
tree41d7f30089044de3342951803e29d41f66be1b29
parent5024a70ffe8e3a2b51ba8945af8d712db4f4ecf7 (diff)
parent140a5e372e36556c63d4ea4c694cb67b8ff88cd8 (diff)
downloadandroid_external_bouncycastle-c50b2c590028111b7d74492c3bead4afedf7d070.tar.gz
android_external_bouncycastle-c50b2c590028111b7d74492c3bead4afedf7d070.tar.bz2
android_external_bouncycastle-c50b2c590028111b7d74492c3bead4afedf7d070.zip
am 140a5e37: am 79c4cebc: am c7d8bdf8: am 188fa18c: am 8926a7f4: am 11b9edd9: am 43d770e5: am 419a4f8c: am 4eb82579: Merge commit \'ac69e78f\' into jb-mr1-dev
* commit '140a5e372e36556c63d4ea4c694cb67b8ff88cd8': Add certs to blacklist.
0 files changed, 0 insertions, 0 deletions