Chia-chi Yeh 82a1372070 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.
2010-10-01 17:08:30 -07:00
..
2010-09-29 16:55:15 -07:00
2010-09-30 21:40:14 -07:00