diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-10-22 09:28:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-22 09:28:39 +0000 |
| commit | 4d77a3e19534e6467138478609b1f189662b0128 (patch) | |
| tree | 887b7a4e422b5b045776f9d2fd422508e7e68a9e /keystore/java/android/security/KeyChain.java | |
| parent | f9527fd0ed65213e38372a141de0f7328a4e8cbb (diff) | |
| parent | 5e891bcc04556a3595ab349381acc2a2e36a69d1 (diff) | |
Merge changes from topics "lockscreen-pin", "locksettings-aidl"
* changes:
Introduce Lockscreen PIN credential as first-class citizen
Introduce LockscreenCredential to LockSettingsService
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions