summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-10-30 19:41:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-30 19:41:24 -0700
commit06a4fa4f52a088779807c66066a44132a869dfcf (patch)
tree0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp
parent8eb8a796574c8546eea753359c2abc6e9ac51847 (diff)
parenteb99f03568f5d13df43c346d958261fdf5cf6b5f (diff)
Merge "HorizontalScrollView should delay child presses" into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions