summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-14 19:05:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 19:05:11 -0700
commitf335f421310338bdd8ba2eddbc4e5921d46511fa (patch)
treefcd455d88c532282c943e64fe131b47e7eae1600 /opengl/tests/gl_basic/gl_basic.cpp
parent8b3cb0d4cc6a22d712e27488f92a4a2ac06588d6 (diff)
parent62636a7ae5bf928c4da70ead2fac96fdb770b959 (diff)
am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0' into froyo-plus-aosp * commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0': Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions