OSDN Git Service

Merge "Adapt to underlying changes in the PBKDF2 implementation"
authorChristopher Tate <ctate@google.com>
Wed, 29 Jan 2014 21:42:57 +0000 (21:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jan 2014 21:42:58 +0000 (21:42 +0000)
commit5e31fdbacd11fa3750b82004aa80cef0260951e9
tree613a9da37b2a882954d5f7ecc131e7eed546cd7e
parent967c7fb2af23cbdadba45f9113cbcaa9f55c3f24
parent684d6f9f4d1a11069d9c9c1996fbc45cda7e7f04
Merge "Adapt to underlying changes in the PBKDF2 implementation"