diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-03-28 01:05:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 01:05:15 +0000 |
| commit | 66431ff0708d4ad03c7767f714509ffe4d038cc0 (patch) | |
| tree | 09468227c5b743b0bf76314451c82dfc64169b8d | |
| parent | c7d8bdf84b03bcf893835468ff37dffd7b134b68 (diff) | |
| parent | 217f2f353a87d1e6989ea260d6bfd115e80e3caf (diff) | |
| download | android_external_bouncycastle-66431ff0708d4ad03c7767f714509ffe4d038cc0.tar.gz android_external_bouncycastle-66431ff0708d4ad03c7767f714509ffe4d038cc0.tar.bz2 android_external_bouncycastle-66431ff0708d4ad03c7767f714509ffe4d038cc0.zip | |
am 217f2f35: (-s ours) resolved conflicts for merge of 78cfdf68 to jb-mr2-dev-plus-aosp
* commit '217f2f353a87d1e6989ea260d6bfd115e80e3caf':
Add ANSSI intermediate to the on-device blacklist.
0 files changed, 0 insertions, 0 deletions