diff options
| author | Dave Burke <daveburke@google.com> | 2011-11-04 11:59:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 11:59:27 +0000 |
| commit | 14c82e0af978d280c3bc4aa1075842edca68622c (patch) | |
| tree | 126d691334ba8d6ffd25b48654a0ee129bc3188b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e0d02e00bf23528620870c17fc78b9c856a4b856 (diff) | |
| parent | e11ccb28d13cc73bf5bd9827dc1ba12e7b80b2bf (diff) | |
am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions