diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-10-31 19:45:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 19:45:33 +0000 |
| commit | 69360645284e71c1370344f2feff6d3ddd472ebc (patch) | |
| tree | 0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f68912a081fda5cbb3ec14d2d7c73621cba7d26b (diff) | |
| parent | 76c5c69255b4d84b3faad1034a1c9769a438fe29 (diff) | |
am 50d0511d: Reconcile with ics-factoryrom-2-release
* commit '50d0511ddbf226255347e95a6382af8b0e7d366b':
Revert "Improve the slow query instrumentation."
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions