| commit | a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4 | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Fri Oct 01 16:16:17 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 01 16:16:17 2010 -0700 |
| tree | 9398b4fbc8da10a16dbf7546b204c289a6514050 | |
| parent | edec27a1e9ffc022e68f0d6200ba90499da4b9e9 [diff] | |
| parent | 9430f9d37ec169ce0654bc8950adb66ac974b761 [diff] |
am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp * commit '9430f9d37ec169ce0654bc8950adb66ac974b761': KeyStore: Update the parameters of generating master keys.