summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-14 15:26:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-14 15:26:58 -0700
commit579a30dca29cfaf78b1315f8b439700001661bca (patch)
treeb8497ded6aaf370feca2299360a4b12c867db928 /opengl/tests/gl_basic/gl_basic.cpp
parent520eb2f5b569d1147b949584dd73ea64c58726c6 (diff)
parentc9eb44612b7b9acaa0e0ded41f22232cb0751a45 (diff)
Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions