| commit | a1a631ccf54bbb4646963e4df7c6c0ef5de111f7 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Nov 23 10:45:24 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 23 10:45:24 2009 -0800 |
| tree | 895c905d8ba8c7469f5012dea493a06479a4dc77 | |
| parent | 39d27ccb1df629ec51d6441f4cc78bbee834b7e4 [diff] | |
| parent | 8e43ef26feb9ca222704113d65cba2bb71f7403f [diff] |
am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp * commit '34c5813e488fd4f044e545f177a20f553580ce6a': Fix deadlock in WindowManagerService.reenableKeyguard()