| commit | 835f051f72fd1822a91617e4c80ddd6d900e5916 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Nov 23 10:40:54 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 23 10:40:54 2009 -0800 |
| tree | 4cbc4dc7b3c053cf9f5dac1db1cccba7ce3a10a0 | |
| parent | ef3b2191ac2ecd29edd6292cf3e010d203b13571 [diff] | |
| parent | 634014cfb4a30022668ee7695c6cfd0b2858660f [diff] |
am 174b7269: Merge change Id886fb28 into eclair Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-plus-aosp * commit '174b726917c12d61f9135a180afc8413d845dc2d': Fix deadlock in WindowManagerService.reenableKeyguard()