| commit | 58addfd94b84525c6cb277e6a14959a0a3f768c1 | [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 | 594515643d75e78a3d4f78e27d24b5cf53c8b1b6 | |
| parent | a0380fb6c514240a8b1fcda114446e71ff88c4af [diff] | |
| parent | 758e48f61f1a0f97ded70663b4b486bbe51985a9 [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.