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:
4e854a5
b4fb987
)
Merge "Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot."
author
Dmitry Dementyev
<dementyev@google.com>
Sat, 27 Jan 2018 00:37:53 +0000
(
00:37
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Sat, 27 Jan 2018 00:37:53 +0000
(
00:37
+0000)
1
2
services/core/java/com/android/server/locksettings/LockSettingsService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/locksettings/LockSettingsService.java
Simple merge
diff --cc
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
Simple merge