summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2010-04-14 12:11:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 12:11:21 -0700
commit6f4b3964881148765ae2496fe06eece4e2057266 (patch)
tree744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp
parent4e52bafe10708dc3e5ed9ee47f95d0a916e07895 (diff)
parent8dd91d14acf1d7e0f3936726d7c9cfa1de977f01 (diff)
am 6083f5eb: am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Merge commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3' into kraken * commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3': Make sure the onended event is dispatched even when
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions