diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 23:14:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 23:14:46 -0700 |
| commit | eb7a4298e6f508379afd33daf67db2845e44f373 (patch) | |
| tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 06c725e551461919b320dc3ec0f9a439fb5d7532 (diff) | |
| parent | f1481181ed46dc1d6984b399d527a88a2c173255 (diff) | |
am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp
* commit '506d724cc356a7ba73995ef2929c65062277c83d':
DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions