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:
603b911
fd4ae0b
)
Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev
author
Dmitry Dementyev
<dementyev@google.com>
Sat, 24 Mar 2018 00:10:30 +0000
(
00:10
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Sat, 24 Mar 2018 00:10:30 +0000
(
00:10
+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