am 61cf4b90: am f8a57dcb: am eadb97b4: Merge change I53f83502 into eclair

Merge commit '61cf4b906ba09da49c924dc6f9295169c6638ef0'

* commit '61cf4b906ba09da49c924dc6f9295169c6638ef0':
  PowerManagerService: Ignore user activity while the screen is animating off.