diff options
| author | Andreas Huber <andih@google.com> | 2010-10-01 11:21:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 11:21:16 -0700 |
| commit | 777f6b7ede67b400a0f2ea5efcd1211e0b885aaf (patch) | |
| tree | 69f33d22b47959c9522cfef749a5057131aa68f9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fb5a36a133b3a719c90e24fa2da72c21904a7ec9 (diff) | |
| parent | c9e22d2a824d3d8bf390a49fce4757fc842224ba (diff) | |
am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'
* commit '14401bf7bca34c692f248406c78bd8b49783217a':
Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions