OSDN Git Service
(root)
/
android-x86
/
frameworks-policies-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa550b2
6cc42b7
)
am 6cc42b70: am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2
author
Mike Lockwood
<lockwood@android.com>
Wed, 2 Dec 2009 02:36:29 +0000
(18:36 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 2 Dec 2009 02:36:29 +0000
(18:36 -0800)
Merge commit '
6cc42b70c592d5a112809a0230764819de3c7c12
'
* commit '
6cc42b70c592d5a112809a0230764819de3c7c12
':
Fix bug
2290852
: Screen wakes up in my pocket while listening to music
Trivial merge