tree ecc1519ff222a3c944b2470593d28fa14c04a979
parent 91b0bc2a282f63f0ee532b5748c210bb67ba6fb3
parent 2509976269fbd9fbd0ec3561e20fdfbd9b897a09
author Chia-chi Yeh <chiachi@android.com> 1285972483 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285972483 -0700

Merge "KeyStore: Update the parameters of generating master keys." into gingerbread