am 5ad40971: am 6abf7c8f: Merge change Iad66a274 into eclair

Merge commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea' into eclair-mr2-plus-aosp

* commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea':
  Fix race condition in WindowManagerService.disableKeyguard()