tree 94e3eef7c09f5ca14b2df57e476f8502ea24c337
parent f555bf65e18407314f569c1c767e5334cf3f56bf
parent f836acf241f10d943d72d439fa425fda73a6d56b
author Dianne Hackborn <hackbod@google.com> 1255371090 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255371090 -0700

am f836acf2: Merge change I067d55ea into eclair

Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app