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:
3c631aa
cbd4b2f
)
Merge "Add tests for KeySyncUtils now that SecureBox is available"
author
Robert Berry
<robertberry@google.com>
Thu, 21 Dec 2017 08:42:53 +0000
(08:42 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 21 Dec 2017 08:42:53 +0000
(08:42 +0000)
1
2
services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncUtils.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncUtils.java
Simple merge