diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-23 10:40:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-23 10:40:13 -0800 |
| commit | 34c5813e488fd4f044e545f177a20f553580ce6a (patch) | |
| tree | 3875e16d9a3137a682b1e9bd4997f2353e4e5f24 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cd979d555fbf991bdc59b3521281786e78e809fc (diff) | |
| parent | 174b726917c12d61f9135a180afc8413d845dc2d (diff) | |
am 174b7269: Merge change Id886fb28 into eclair
Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2
* commit '174b726917c12d61f9135a180afc8413d845dc2d':
Fix deadlock in WindowManagerService.reenableKeyguard()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions