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 | 8e43ef26feb9ca222704113d65cba2bb71f7403f (patch) | |
| tree | 3ced73c769202ea487bffa748795e441d16f34fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a61586697a7785350797b1a278559530875f92d6 (diff) | |
| parent | 634014cfb4a30022668ee7695c6cfd0b2858660f (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