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:
c70f90b
b815506
)
am b8155068: Merge change 25944 into eclair
author
Mike Lockwood
<lockwood@android.com>
Sun, 20 Sep 2009 04:33:32 +0000
(21:33 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sun, 20 Sep 2009 04:33:32 +0000
(21:33 -0700)
Merge commit '
b8155068ef855147d86465817be2660a5212a6bb
' into eclair-plus-aosp
* commit '
b8155068ef855147d86465817be2660a5212a6bb
':
Wake the screen if the proximity wakelock is released while the proximity sensor is active.
Trivial merge