diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-07 17:38:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 17:38:40 +0000 |
| commit | 38dc15421eaa61d20939d00695d7b7515302c7e8 (patch) | |
| tree | c50dc934b91f48859828e51460422cc872dafb64 /keystore/java/android/security/KeyStoreParameter.java | |
| parent | e0895660dac3fc87665d2cf7b0ca6906ab89cec1 (diff) | |
| parent | 83a86c5ce4c04c6e885b08dbdf4a07a18371a3e5 (diff) | |
Merge "Always mix in additional entropy into keymaster." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/KeyStoreParameter.java')
0 files changed, 0 insertions, 0 deletions