| commit | 1d13f13deac644bddbae8a1f92642074a32d7a6c | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Mar 05 00:51:32 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 05 00:51:33 2014 +0000 |
| tree | 12ce3622ba1d2cb4495e280b6c94df2a05ba223f | |
| parent | 1e995c76485f8a7477177886890b834c31e8d1a6 [diff] | |
| parent | 28c8cfd7624902bbd72cb021fe000e0a8c818aab [diff] |
Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev