commit | bdf8034c657147226b2390eef113ff841e0d6065 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Wed Oct 13 18:29:43 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 13 18:29:43 2010 -0700 |
tree | 58be0affeafef6d38ef9e53744af1aaf1a7a8fa8 | |
parent | cebe5b2e01f8ebbf9089aebc386caecea232df76 [diff] | |
parent | 3b1abba6bbc895d63da3e82e9b158c01bd12eddd [diff] |
Merge "OBB: use PBKDF2 for key generation." into gingerbread