diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-24 09:03:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 09:03:29 -0700 |
| commit | 297e0a2e26edfcdcd3f13ecaee0a24980d246025 (patch) | |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c5d0c0932eeda4b02707fe04454630debcedf775 (diff) | |
| parent | c5b8ae8dce8c78142ae416af40a31e78e11f176c (diff) | |
am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'
* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
Tracking merge of dalvik-dev to gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions