Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp * commit '34c5813e488fd4f044e545f177a20f553580ce6a': Fix deadlock in WindowManagerService.reenableKeyguard()
Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp * commit '34c5813e488fd4f044e545f177a20f553580ce6a': Fix deadlock in WindowManagerService.reenableKeyguard()