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:
3d0a536
2bdc21e
)
Merge "Updates isKeyguardSecure to take in a user id."
author
Brad Stenning
<stenning@google.com>
Tue, 19 Mar 2019 18:52:00 +0000
(18:52 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 19 Mar 2019 18:52:00 +0000
(18:52 +0000)
1
2
core/java/android/app/KeyguardManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/KeyguardManager.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
OSDN Git Service
