diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-03-28 05:23:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 05:23:35 +0000 |
| commit | 4911752a3b147cb3819d8615f6d7222cb92ab3af (patch) | |
| tree | 41d7f30089044de3342951803e29d41f66be1b29 | |
| parent | c50b2c590028111b7d74492c3bead4afedf7d070 (diff) | |
| parent | 6868508723a6bb5d24eb8a1afc91e6c817630e90 (diff) | |
| download | android_external_bouncycastle-4911752a3b147cb3819d8615f6d7222cb92ab3af.tar.gz android_external_bouncycastle-4911752a3b147cb3819d8615f6d7222cb92ab3af.tar.bz2 android_external_bouncycastle-4911752a3b147cb3819d8615f6d7222cb92ab3af.zip | |
am 68685087: am 913c25a4: am 66431ff0: am 217f2f35: (-s ours) resolved conflicts for merge of 78cfdf68 to jb-mr2-dev-plus-aosp
* commit '6868508723a6bb5d24eb8a1afc91e6c817630e90':
Add ANSSI intermediate to the on-device blacklist.
0 files changed, 0 insertions, 0 deletions