| commit | 5ad409719809b4070ba0bb36c5326c7cac7c75ea | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Oct 12 11:21:28 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 11:21:28 2009 -0700 |
| tree | af95d1bd531e1c8b8894d1b0b9317cae2f0ad5cb | |
| parent | 77df9d6e0ca56a34c66a1e30e9696085ddbd9038 [diff] | |
| parent | 6abf7c8fccf1430bf5d730592b79d77fbeccfe5b [diff] |
am 6abf7c8f: Merge change Iad66a274 into eclair Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-mr2 * commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b': Fix race condition in WindowManagerService.disableKeyguard()