summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-12 11:51:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-12 11:51:13 -0700
commit2669131aed3ef6b665cb6f8fd873b6fb0f8a86b1 (patch)
tree4591eed5eaba8f05277ee3cfe83e339a2a7edc6c /opengl/tests/gl_basic/gl_basic.cpp
parentd1c53a19615cab1823e204b339df3990aecb0dfa (diff)
parent8d5ed611214d500f2761b45ce6477b158f0d0aba (diff)
am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Merge commit '8b8a8f65b5306aa557028feba7317470222a73df' * commit '8b8a8f65b5306aa557028feba7317470222a73df': fix a bug where timeouts would only be handled when a message was delivered
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions