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:
87cef51
1cf91a0
)
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Tue, 23 May 2017 01:45:37 +0000
(
01:45
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 23 May 2017 01:45:41 +0000
(
01:45
+0000)
1
2
services/core/java/com/android/server/LockSettingsService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/LockSettingsService.java
Simple merge
OSDN Git Service
