diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-06-07 10:01:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 10:01:28 -0700 |
| commit | c3c1b199f076989745614e62ac79b2e9ad089f07 (patch) | |
| tree | b73c9c65f0df4ca1d56376e414f032d4c35d4309 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8f6540741c9d37a5141d2b5574a2223e14d55979 (diff) | |
| parent | 9ea7f08b7918bac7f9150b0b87513cd95554d302 (diff) | |
am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit 'c8410017502dacff43ecd3e0926049b99fc186a8':
Remove discoverable timeout handler. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions