| commit | 07064a72e165536c708ceffe5b4d59bfffd25d5d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Jun 03 14:50:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 14:50:06 2013 -0700 |
| tree | 26788a2b8a81b77589fc850adabbc144fa261bed | |
| parent | 9a272f433da746ae356e9e779943d45c8e96ff99 [diff] | |
| parent | 0897c6055311bf665365cbb8cae46aadc18d4d45 [diff] |
am 0897c605: Merge "PBKDF2 tests to exercise new, correct PBE implementation." * commit '0897c6055311bf665365cbb8cae46aadc18d4d45': PBKDF2 tests to exercise new, correct PBE implementation.