diff options
| author | Dan Egnor <egnor@google.com> | 2010-04-08 14:19:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-08 14:19:52 -0700 |
| commit | 1dbebb262723cec53f64d1587c1fd3851c03133c (patch) | |
| tree | 29bbf39e6ff004477b6949327165181486dffbd5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 187a98c25e1de59b06abaa71d7ad84aac59ab398 (diff) | |
| parent | 7f22a7ccd1d2b982fe5f3513c2dab06609291194 (diff) | |
am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions