OSDN Git Service

(root) / android-x86 / frameworks-policies-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95dfd67 90bca75)
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)
Merge commit '90bca75513297c2e851638f06ecc821ce75fcbe5' into eclair-mr2-plus-aosp

* commit '90bca75513297c2e851638f06ecc821ce75fcbe5':
  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