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:
bf36f75
f561d7f
)
Merge "sys user split: turn off unlocking for sys user."
author
Xiaohui Chen
<xiaohuic@google.com>
Thu, 16 Jul 2015 16:39:35 +0000
(16:39 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 16 Jul 2015 16:40:03 +0000
(16:40 +0000)
1
2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
Simple merge