summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2010-09-14 10:26:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-14 10:26:44 -0700
commite95f395c15c6c337eb290364ec27b1dcf8d36a34 (patch)
tree1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp
parentfed3a15b282e72ed2748de476919aad6c6c7f9cc (diff)
parentefe02e796b5d46cf848163081e4cfd23927d12db (diff)
am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp * commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b': Add an option to hide the Voice Search icon.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions