OSDN Git Service

(root) / android-x86 / frameworks-policies-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa550b2 6cc42b7)
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)
Merge commit '6cc42b70c592d5a112809a0230764819de3c7c12'

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


Trivial merge
frameworks/policies/base
About OSDN
Find Software
Develop Software
Help