commit | a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@android.com> | Mon Oct 12 11:26:58 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 11:26:58 2009 -0700 |
tree | ce436107a03115270668fa5e9378549abb861e8e | |
parent | 132570cbf4715fa13d237f1255848caf0dbd9d79 [diff] | |
parent | 5ad409719809b4070ba0bb36c5326c7cac7c75ea [diff] |
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()