| commit | 1efc6e52d65389463ad52c32df02d68493df0f48 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Mar 05 00:54:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 05 00:54:17 2014 +0000 |
| tree | c71a7e1af6853598fac7a88056feba1ec759f831 | |
| parent | f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec [diff] | |
| parent | 1d13f13deac644bddbae8a1f92642074a32d7a6c [diff] |
am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev * commit '1d13f13deac644bddbae8a1f92642074a32d7a6c': Adapt to underlying changes in the PBKDF2 implementation