diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 10:19:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-06 10:19:51 -0700 |
| commit | b045861d2fa6e3b98e0303279521695b0692d93f (patch) | |
| tree | dc00c34fe21c4b8fbd3bbdc7d29ee49e80406a66 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b6f64041d1ed356a5fa1bdcee77f4dc8dee6c13d (diff) | |
| parent | 0215f0f11162ab5f1f89907f9d258c7f432c56c3 (diff) | |
am 3efbdf6f: (-s ours) Merge change 20267 into donut
Merge commit '3efbdf6f253f905c8672108a6329886105edec7c'
* commit '3efbdf6f253f905c8672108a6329886105edec7c':
Do not merge
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions