tree 237501aa6db4648598e32a783a638b77b9d27b80
parent 3621be68a2f4912c76b08cd1a9df8601006215b9
parent a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4
author Chia-chi Yeh <chiachi@android.com> 1285978110 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285978110 -0700

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.