summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2010-10-08 17:14:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-08 17:14:56 -0700
commitcc7fa4373618649183347bfe26aae5eec8d72c25 (patch)
tree4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp
parent97df820ba8bfc30b8dc8016851edd5428604813a (diff)
parente0af18ecb6e3e94f1b7146fc8a8c98e47d62e0c8 (diff)
am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp * commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd': DO NOT MERGE Limit the height of the pull glow.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions