summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2010-09-15 07:08:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 07:08:49 -0700
commit859c074c029b72f80e5d2a7ced862038c62886db (patch)
tree1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp
parentd0def4800f22618fbd7ac356cfc8748512f85f3f (diff)
parente95f395c15c6c337eb290364ec27b1dcf8d36a34 (diff)
am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298' * commit '720d5985f5d31912c97b7e549230d241e58c1298': 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