diff options
| author | Andreas Huber <andih@google.com> | 2010-10-01 11:03:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 11:03:47 -0700 |
| commit | c9e22d2a824d3d8bf390a49fce4757fc842224ba (patch) | |
| tree | 75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 95fafca8d5395d414c62a4135eed7f98dd54ab33 (diff) | |
| parent | 47ec74b31c80ff8aa2afd3181d321f15247c2f27 (diff) | |
am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp
* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions