tree cac0458d93515908ffc30551bb72d38f3efac3b1
parent 54ab551b4616c4bc1271fb2402d2d67e69ebb685
parent b8bddcfe1c0fdb5fd26a0285673f7d4d488dbab7
author Brian Carlstrom <bdc@google.com> 1359529217 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359529217 -0800

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