diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-09-01 06:12:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 06:12:16 -0700 |
| commit | c6f9933204700952b0168e5d1f2d670e91ac9a67 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 00afc6159174e67fdc145e99fc8964978eaa0d96 (diff) | |
| parent | b4afe06506446dafdc905f8d587bd34b511734f5 (diff) | |
am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp
* commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions