OSDN Git Service

Merge "Always mix in additional entropy into keymaster." into mnc-dev
authorAlex Klyubin <klyubin@google.com>
Thu, 7 May 2015 17:38:39 +0000 (17:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 May 2015 17:38:40 +0000 (17:38 +0000)
commit38dc15421eaa61d20939d00695d7b7515302c7e8
treec50dc934b91f48859828e51460422cc872dafb64
parente0895660dac3fc87665d2cf7b0ca6906ab89cec1
parent83a86c5ce4c04c6e885b08dbdf4a07a18371a3e5
Merge "Always mix in additional entropy into key" into mnc-dev
keystore/java/android/security/KeyStoreCipherSpi.java
keystore/java/android/security/KeyStoreKeyGeneratorSpi.java