diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-23 14:28:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-23 14:28:52 -0700 |
| commit | aba26a8ba4abc1645d2131ea2d8a0434364b4f80 (patch) | |
| tree | 0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a4c0e8f248c431eb1447a5a48e7de8ba17dd9854 (diff) | |
| parent | dd75ae71a08e3cdeb767e2e76f8e49d4d22a3098 (diff) | |
am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo
Merge commit '994e39908b167fb70883ce6c1146433e0486e86f' into kraken
* commit '994e39908b167fb70883ce6c1146433e0486e86f':
Fix issue #2621809: Kill! Kill! Kill!
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions