summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-08-20 12:04:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-20 12:04:07 -0700
commitee4acc392394a91e1672dd5ce829a8cb2f36df79 (patch)
tree849c2bad6cc17de4aabbf3d7c77473978f489cc3 /opengl/tests/gl_basic/gl_basic.cpp
parentffc04b3da6d080f5d2e4470cd2d82497a9f3b474 (diff)
parentd18227e5ce475e47e50059823e4142ae5f809198 (diff)
am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp * commit '4b1bdc0209650436ebe0dad1020080cc891e97b6': DO NOT MERGE Fixing Connectivity
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions