summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike LeBeau <mlebeau@android.com>2010-04-16 07:27:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-16 07:27:34 -0700
commit4b54ad047aab846694cc1217d0edb6fef751e369 (patch)
treefcd455d88c532282c943e64fe131b47e7eae1600 /opengl/tests/gl_basic/gl_basic.cpp
parent600f5d24927043bd7eca79774b4dff3dae8115a5 (diff)
parent5ed86e4c8a37c2b6042602ba2f953a1effb119c8 (diff)
am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp * commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a': For search suggestions in the search dialog, allow the 'title'
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions