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:
e5617cc
72f5755
)
Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Fri, 23 Mar 2018 20:03:45 +0000
(20:03 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 23 Mar 2018 20:03:45 +0000
(20:03 +0000)
1
2
core/java/android/security/keystore/recovery/RecoveryController.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/security/keystore/recovery/RecoveryController.java
Simple merge