Commits
Mike Lockwood authored and Android Git Automerger committed 45a4bfaca27M
am 6cc42b70: am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2 Merge commit '6cc42b70c592d5a112809a0230764819de3c7c12' * commit '6cc42b70c592d5a112809a0230764819de3c7c12': Fix bug 2290852: Screen wakes up in my pocket while listening to music
Showing diff to8df18d3094a