OSDN Git Service

am 6cc42b70: am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Wed, 2 Dec 2009 02:36:29 +0000 (18:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 02:36:29 +0000 (18:36 -0800)
commitd7763d90283864cc5f5886a8a36c48b511a38d2f
tree24ccd3806704182e8b0baf7f33624c84246bcbeb
parentfa550b26a27437614404ecb11b92e21d8be4a5e2
parent6cc42b70c592d5a112809a0230764819de3c7c12
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