diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-05-11 10:23:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-11 10:23:56 -0700 |
| commit | bd516f83b314ddb7d2e45a1ad972e7eabd549ff3 (patch) | |
| tree | b013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7f0364ebfc11de470b79be4393dbe26553af0613 (diff) | |
| parent | ead2a8ad7dc941642b63e69a12c8281dd172d071 (diff) | |
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
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