summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-05-12 07:56:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:56:19 -0700
commitd643705c0648d7ecc33df8bc38b3638d0b43ab54 (patch)
tree19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp
parent83029bcb7a68ad1a4c6144a7abc8301f7226defa (diff)
parent3bf653e82a790619f80880b6276ff8761e5b964d (diff)
am b6e1ec19: am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo
Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken * commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366': Fix issue #2676378: Activity Manager Crash on FRF40
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions