| commit | 8fda1636e3e35f060b9046294efd3c062a1fdb84 | [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 | 9c5d4cb8df12357a067f5214eb2f3dbd08d252ca | |
| parent | e3c50a5470f64fd99438d6fd985f88d9fe20919a [diff] | |
| parent | bdf8034c657147226b2390eef113ff841e0d6065 [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.