diff options
| author | Swarna Kumar <skumar@google.com> | 2009-11-24 13:33:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-24 13:33:13 -0800 |
| commit | e6987ad74bae1951c551a4228090071691ed817a (patch) | |
| tree | 3ced73c769202ea487bffa748795e441d16f34fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 78d0cd8382af5be8737276f6ab2670fbe308cef8 (diff) | |
| parent | 0467b21f5a808392da7f03dc9be2eb9d96483636 (diff) | |
am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2
* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions