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:
51e33d1
5a1acef
)
Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Tue, 27 Mar 2018 09:09:54 +0000
(09:09 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 27 Mar 2018 09:09:54 +0000
(09:09 +0000)
1
2
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java
Simple merge