diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-05 10:40:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 10:40:45 -0700 |
| commit | dfc4636b0e0baa39f09d5c7e95c7376e8b1ef87d (patch) | |
| tree | fa9980169c3a61a355714df5f4a5f96a26944d62 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6471436a59a4c4845607a03e53ab270e7981bb29 (diff) | |
| parent | f62a2a12fb46fa777817648a978c5a16d44686c3 (diff) | |
am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions