OSDN Git Service

am 356ceb58: am be699645: Merge change I56544d0e into eclair
authorJim Miller <jaggies@google.com>
Thu, 1 Oct 2009 18:40:29 +0000 (11:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Oct 2009 18:40:29 +0000 (11:40 -0700)
commit1a9f1bd06582739f99eaa89af99ce7262ae8ca1f
treeb4b04fd9b2e3168b29ff5a7db5eaee1f66533934
parent9bae0a31789852918a22cebcdb12e129afb3aac6
parent356ceb5853243762d00d0c4e1482fbe887f66e3e
am 356ceb58: am be699645: Merge change I56544d0e into eclair

Merge commit '356ceb5853243762d00d0c4e1482fbe887f66e3e'

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