| commit | 5e31fdbacd11fa3750b82004aa80cef0260951e9 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jan 29 21:42:57 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 29 21:42:58 2014 +0000 |
| tree | 613a9da37b2a882954d5f7ecc131e7eed546cd7e | |
| parent | 967c7fb2af23cbdadba45f9113cbcaa9f55c3f24 [diff] | |
| parent | 684d6f9f4d1a11069d9c9c1996fbc45cda7e7f04 [diff] |
Merge "Adapt to underlying changes in the PBKDF2 implementation"