| commit | 7f7c9a24b66277312c5e0426731598b8bfd11a14 | [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 | 3f0c2533650544141d361aba34232f5ce7ca4c70 | |
| parent | 5ebbba59e7e339b26554f2e5454978f3ce4042ea [diff] | |
| parent | 95a68893125105f131ee1b4eaef1dc16da1ef789 [diff] |
Merge "OBB: use PBKDF2 for key generation." into gingerbread