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:
7d0882b
e23ab8b
)
Merge "Selectively enable back button in keyguard for security screens." into jb...
author
Jim Miller
<jaggies@google.com>
Tue, 18 Sep 2012 22:32:04 +0000
(15:32 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 18 Sep 2012 22:32:04 +0000
(15:32 -0700)
1
2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
Simple merge