Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-plus-aosp * commit '174b726917c12d61f9135a180afc8413d845dc2d': Fix deadlock in WindowManagerService.reenableKeyguard()
Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-plus-aosp * commit '174b726917c12d61f9135a180afc8413d845dc2d': Fix deadlock in WindowManagerService.reenableKeyguard()