summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2010-04-06 12:43:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-06 12:43:23 -0700
commitf4ac9129129cdc5dffc33aa47bf73e9b908f44b7 (patch)
treeec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp
parentc035cf3b55fdc0453af7d40fbce0669cd21efa51 (diff)
parentc92f523d3ae9d2db8ee54fcd166a417173378569 (diff)
am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken * commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7': Fix 'bmgr restore'
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions