diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-02-12 15:36:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-12 15:36:20 -0800 |
| commit | 6952841d8bb45902e78153a0422589efbf71fd82 (patch) | |
| tree | 4bfe4bc15b03aa8d8500a76bc6829d7511a69653 | |
| parent | 70c8287138e69a98c2f950036f9f703ee37228c8 (diff) | |
| parent | 0caeb7ed943911549bb6fdcc59a99d2c23b3e5de (diff) | |
| download | bouncycastle-6952841d8bb45902e78153a0422589efbf71fd82.tar.gz | |
am 0caeb7ed: (-s ours) Merge "bouncycastle 1.48 upgrade"
# Via Brian Carlstrom (1) and Gerrit Code Review (1)
* commit '0caeb7ed943911549bb6fdcc59a99d2c23b3e5de':
bouncycastle 1.48 upgrade
0 files changed, 0 insertions, 0 deletions