diff options
| author | Adam Powell <adamp@google.com> | 2010-10-01 17:07:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 17:07:43 -0700 |
| commit | 7960b17ab16a07cad93ce2439327f253cbb66fb0 (patch) | |
| tree | 1f0d342cbed2ea50622e9a4e941d45ace6afca65 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 569c5d1f09842dcea808be028dc74430e7197d65 (diff) | |
| parent | 5f07bee4543a70fe305e79d048ad9e5ec4235d23 (diff) | |
am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread
Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'
* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
DO NOT MERGE Fix bug 3026771, other design/asset fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions