| commit | 82a1372070e75df1a0201b22e33514bbb0d7b5e5 | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Fri Oct 01 17:08:30 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 01 17:08:30 2010 -0700 |
| tree | 237501aa6db4648598e32a783a638b77b9d27b80 | |
| parent | 3621be68a2f4912c76b08cd1a9df8601006215b9 [diff] | |
| parent | a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4 [diff] |
am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread Merge commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4' * commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4': KeyStore: Update the parameters of generating master keys.