| commit | 1866591c192a434c3edcafb808e31b8262cadeb2 | [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 | eb0616a277d51a14c1b1bb30bf0b609554f023b0 | |
| parent | d0a1101f1df69bcaee81ad4d4fcf9509257e738c [diff] | |
| parent | 34c5813e488fd4f044e545f177a20f553580ce6a [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()