OSDN Git Service

am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Wed, 2 Dec 2009 02:31:12 +0000 (18:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 02:31:12 +0000 (18:31 -0800)
commit6cc42b70c592d5a112809a0230764819de3c7c12
tree24ccd3806704182e8b0baf7f33624c84246bcbeb
parent95dfd677c99b9e6a206366348e8e2e945d27ff0b
parent90bca75513297c2e851638f06ecc821ce75fcbe5
am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2

Merge commit '90bca75513297c2e851638f06ecc821ce75fcbe5' into eclair-mr2-plus-aosp

* commit '90bca75513297c2e851638f06ecc821ce75fcbe5':
  Fix bug 2290852: Screen wakes up in my pocket while listening to music