diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-11-01 17:10:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 17:10:39 +0000 |
| commit | 49c742032d08109395460be26c4a60def159cbcb (patch) | |
| tree | 0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e0019f711f71e80f906a65a71a6bf6c2ca3469cd (diff) | |
| parent | 0c60db0becbaf950ae85731709c335380ff8652b (diff) | |
am 9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
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