diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-02-04 11:29:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 11:29:37 -0800 |
| commit | cb59b9889be18464ca3b9a78ea142c3bafdb289f (patch) | |
| tree | 440fe2257ad8a4d11cc68f4fc7152b7dc1e1f8d4 /bcprov/src/main/java/org/bouncycastle/jce | |
| parent | 8d8898cca6a8e85ab5f3d1a4faa6af55a2912785 (diff) | |
| parent | 2d8d9ce072842c1c67e912686fd20795c43f221d (diff) | |
| download | android_external_bouncycastle-cb59b9889be18464ca3b9a78ea142c3bafdb289f.tar.gz android_external_bouncycastle-cb59b9889be18464ca3b9a78ea142c3bafdb289f.tar.bz2 android_external_bouncycastle-cb59b9889be18464ca3b9a78ea142c3bafdb289f.zip | |
am 2d8d9ce0: resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp
# By Geremy Condra
# Via Android Git Automerger (1) and others
* commit '2d8d9ce072842c1c67e912686fd20795c43f221d':
Add certs to blacklist.
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jce')
0 files changed, 0 insertions, 0 deletions