summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-05-11 10:18:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-11 10:18:55 -0700
commitead2a8ad7dc941642b63e69a12c8281dd172d071 (patch)
tree476ae738583482b7fe7952f52a73c228a2824d1f /opengl/tests/gl_basic/gl_basic.cpp
parent4d6b1821011d9a631020556e8ace35b238fa7e4b (diff)
parentff91f883059a7d2fb22251d8e2ffbb998c9ca1e4 (diff)
am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp * commit '6d00151c519d5c131cc1480978fe4417cc7bcc79': Hopefully fix issue #2662536: Why is launcher being killed?
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions