diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-05-26 11:38:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 11:38:48 -0700 |
| commit | fd8a76b9d19cbf63c41d7ff8c0a2dc943d07e9cd (patch) | |
| tree | 3f35a3c214429d18476e99d7bd0c04e957a67efd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eed8d87a0dade36489f8ff2f11496dc0181ed580 (diff) | |
| parent | 9a2c1ca2dd96c30a7bd2242cf08e9f4ba80cc31c (diff) | |
am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
Refactor how timeouts are calculated. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions