diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-27 14:38:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-27 14:38:19 -0700 |
| commit | d63a5c3986596d1b58f44bce605a9e13b6d5d6e1 (patch) | |
| tree | 6215955c361bfd25a2ee5743e0948b6354444351 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 706416a8d05fb0b4f6edec28ccdc500fa598d133 (diff) | |
| parent | 8b9292c10d4ccb3daa31b50e835d11bad218e09a (diff) | |
am 1fcabd7b: (-s ours) Merge change 8677 into donut
Merge commit '1fcabd7b328ddde7008d4ba2c401aa7db371ae74'
* commit '1fcabd7b328ddde7008d4ba2c401aa7db371ae74':
DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions