summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-26 10:50:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-26 10:50:11 -0700
commit015125608b2031ff5a4331d502d703d4523891e5 (patch)
tree1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp
parent4fb3a6e0f180b9a500c374be6e250763e067d8ee (diff)
parent3d66e77ef3df84cc979ae9031d6daf6b289d690a (diff)
am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp * commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b': Fix issue #2951784: Launcher crashes on startup
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions