OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f666279 be69964)
am be699645: Merge change I56544d0e into eclair
authorJim Miller <jaggies@google.com>
Tue, 29 Sep 2009 22:49:00 +0000 (15:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Sep 2009 22:49:00 +0000 (15:49 -0700)
Merge commit 'be699645dbae746c431caf9c0736938c55fda588' into eclair-plus-aosp

* commit 'be699645dbae746c431caf9c0736938c55fda588':
  Fix for 2137900: Be more conservative about poking the wakelock


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help