OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f023c4c
c354b89
)
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled...
author
Jim Miller
<jaggies@google.com>
Tue, 8 Jun 2010 02:26:28 +0000
(19:26 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 8 Jun 2010 02:26:28 +0000
(19:26 -0700)
Merge commit '
bde25c207731783a62e3611586fe05cd35add0d9
' into froyo-plus-aosp
* commit '
bde25c207731783a62e3611586fe05cd35add0d9
':
Fix
2737842
: disable keyguard API when device policy is enabled.
Trivial merge