summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-09-17 23:26:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-17 23:26:05 -0700
commit2c45985c235583019d1b2a678157649796a35c1d (patch)
treeee02f1e58e422e38c498d50a4b87648b6597fa36 /opengl/tests/gl_basic/gl_basic.cpp
parentc15bdbfbde2100bbcc94176f6ff931e9b109e05d (diff)
parenta6e7b5f538f604c3d6a37862e42ee3b96c88372f (diff)
am 4a4a53ae: am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4' * commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4': Fix silly touch bug in TextView. Oops.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions