diff options
| author | Mathias Agopian <mathias@google.com> | 2009-12-02 09:47:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 09:47:48 -0800 |
| commit | f764dae4a5f662660bea0657746622b6672b24a9 (patch) | |
| tree | 9b771f17ea28b5c4394a5d8acf7751376aa930e3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cfc2915d926cee14380b54d0960262e748eed4f5 (diff) | |
| parent | 33ad0f9ec8d47660b16ced45242a45f369fe2547 (diff) | |
am 33ad0f9e: Merge change I0e44976a into eclair
Merge commit '33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-mr2
* commit '33ad0f9ec8d47660b16ced45242a45f369fe2547':
fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions