tree ad7d4b766d574fbcd77fa4ae4e62ae940175fca6
parent 24e2cdcecee35098f4a8be936d186bfad18870b5
parent a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb
author Mike Lockwood <lockwood@android.com> 1256807150 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256807150 -0700

am a41ff4b7: am c867958e: am d376d240: Merge change I081f08c1 into eclair

Merge commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb'

* commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb':
  A better solution for ignoring user activity while the screen is animating off.