Commits
Chia-chi Yeh authored and Android Git Automerger committed 82a1372070eM
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.
Showing diff toa4f1eb3d775