am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating...
am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit 'a4f1eb3d'
* commit 'a4f1eb3d':
KeyStore: Update the parameters of generating master keys.