diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-05-27 13:46:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-27 13:46:50 -0700 |
| commit | 9ea7f08b7918bac7f9150b0b87513cd95554d302 (patch) | |
| tree | c790c5fc8fa491fd5310bfe40fd410317fc45515 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba7ce02e8ead5d7939a03af8929d2d09d896dd0a (diff) | |
| parent | 076e66034f2a83ecf4bfe4b9b555622d0735709f (diff) | |
am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
Remove discoverable timeout handler. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions