| commit | 6952841d8bb45902e78153a0422589efbf71fd82 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Feb 12 15:36:20 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 12 15:36:20 2013 -0800 |
| tree | 4bfe4bc15b03aa8d8500a76bc6829d7511a69653 | |
| parent | 70c8287138e69a98c2f950036f9f703ee37228c8 [diff] | |
| parent | 0caeb7ed943911549bb6fdcc59a99d2c23b3e5de [diff] |
am 0caeb7ed: (-s ours) Merge "bouncycastle 1.48 upgrade" # Via Brian Carlstrom (1) and Gerrit Code Review (1) * commit '0caeb7ed943911549bb6fdcc59a99d2c23b3e5de': bouncycastle 1.48 upgrade