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

Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp

* commit '9430f9d37ec169ce0654bc8950adb66ac974b761':
  KeyStore: Update the parameters of generating master keys.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base