| commit | d47001fc34877da2414bd9d681b14484b7744f8a | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Oct 13 22:54:10 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 13 22:54:10 2010 -0700 |
| tree | 4fd2a85cdb33f3a7a91d99776f2abf6e8052ef55 | |
| parent | ac4d53405f04ee347c1b443cf28483df6446a553 [diff] | |
| parent | 7f7c9a24b66277312c5e0426731598b8bfd11a14 [diff] |
am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp * commit 'bdf8034c657147226b2390eef113ff841e0d6065': OBB: use PBKDF2 for key generation.