tree d3b3c41f7c7733c56fe6e044c19268c57c4c2c48
parent 628c258e7e6d124331f5036f0ac546ff0f592a2d
parent 1866591c192a434c3edcafb808e31b8262cadeb2
author Mike Lockwood <lockwood@android.com> 1259002285 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259002285 -0800

am 1866591c: am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair

Merge commit '1866591c192a434c3edcafb808e31b8262cadeb2'

* commit '1866591c192a434c3edcafb808e31b8262cadeb2':
  Fix deadlock in WindowManagerService.reenableKeyguard()