OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58a4769
745d2c9
)
Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Mon, 16 Apr 2018 22:14:22 +0000
(22:14 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 16 Apr 2018 22:14:22 +0000
(22:14 +0000)
1
2
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
Simple merge