| commit | b0aec867fb98dd618faa7a6dc871be5c25e65b8d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jan 29 22:07:28 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 29 22:07:28 2013 -0800 |
| tree | 1e0f711d09ba09a9ea928b47f8db479cd8b972b9 | |
| parent | dbbd6e8a7b85f67585ef3f2141f56f1d29697e9f [diff] | |
| parent | 1f974148051911bfd8e97c333d0d4f667e4a7c50 [diff] |
am 1f974148: Merge "Remove BouncyCastle exclusion of PBE ciphers from wrapping tests" # Via Brian Carlstrom (1) and Gerrit Code Review (1) * commit '1f974148051911bfd8e97c333d0d4f667e4a7c50': Remove BouncyCastle exclusion of PBE ciphers from wrapping tests