diff options
| author | James Dong <jdong@google.com> | 2011-06-10 10:32:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 10:32:21 -0700 |
| commit | 7abe46bd9f374be0fb9da3dd4a414b73b69e120a (patch) | |
| tree | a391a16652e856ed088baf870d69ccd2630df64f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6628fde5526f6ecce30db0c9ee1df6a2fe608152 (diff) | |
| parent | 4be896794d00915daf5d9ec9357c8c6b9c81284b (diff) | |
am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit 'dc03da0444803983aef4988475f2d5dcdf0283e9':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions