summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-27 12:23:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-27 12:23:43 -0700
commit5436d53d203ad2f97b335bb7ab91c1f06a417f0d (patch)
treea1e52df4cb2b69ac028bb1da45c65a37a96365fb /opengl/tests/gl_basic/gl_basic.cpp
parent50de57ad77888f4740fb8a46ecbbf4fa679d2a0e (diff)
parentb481c7930bb1be83d498afbefd74569c829667a8 (diff)
am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread
Merge commit 'e69b286005b0b543e274f523d894e069811215a6' into gingerbread-plus-aosp * commit 'e69b286005b0b543e274f523d894e069811215a6': DO NOT MERGE Removed "Stop selecting text" option.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions