| commit | 8d8898cca6a8e85ab5f3d1a4faa6af55a2912785 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jan 29 23:00:17 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 29 23:00:17 2013 -0800 |
| tree | cac0458d93515908ffc30551bb72d38f3efac3b1 | |
| parent | 54ab551b4616c4bc1271fb2402d2d67e69ebb685 [diff] | |
| parent | b8bddcfe1c0fdb5fd26a0285673f7d4d488dbab7 [diff] |
am b8bddcfe: Merge "Restore PBE Cipher wrap and unwrap support from upstream" # Via Brian Carlstrom (1) and Gerrit Code Review (1) * commit 'b8bddcfe1c0fdb5fd26a0285673f7d4d488dbab7': Restore PBE Cipher wrap and unwrap support from upstream