tree 3cab7a235f806a2a59cc3ada5403064c17f0c631
parent e4aa09d777bc28572cf73134e11a16094032606c
parent cd689e14c7331985b3758674e4d486dcb9083f98
author Jason Sams <rjsams@android.com> 1254422457 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254422457 -0700

am cd689e14: Minor cleanup and fix for the cannot launch apps bug if the screen is still creeping.

Merge commit 'cd689e14c7331985b3758674e4d486dcb9083f98'

* commit 'cd689e14c7331985b3758674e4d486dcb9083f98':
  Minor cleanup and fix for the cannot launch apps bug if the screen is still creeping.