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:
1b3b254
1c2e494
)
Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
author
Sascha Prueter
<saschap@google.com>
Wed, 7 Nov 2012 01:11:26 +0000
(17:11 -0800)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 7 Nov 2012 01:11:26 +0000
(17:11 -0800)
1
2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
Simple merge