diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 23:17:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 23:17:14 -0700 |
| commit | 9e8d35c5181e31ed2fb68cf0895c9bbaca6fef8b (patch) | |
| tree | 9a7df8ac6775e0425ea28e429e271d85701b7710 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4181bd66fc4af4e347b47b3d41a5ca69f81a4ccb (diff) | |
| parent | eb7a4298e6f508379afd33daf67db2845e44f373 (diff) | |
am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread
Merge commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb'
* commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb':
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