summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-21 13:02:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 13:02:06 -0700
commitad1674e06e962158485d01bf712e158d08645092 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parent1311fffca030755e900a44d9fdd9cf99ec510b7d (diff)
parent76d0d482c568486ee76a34b152e05a9d0f1049e1 (diff)
am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp * commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f': Support for download manager "queue for wifi" dialogs
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions