diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-10-31 22:13:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 22:13:37 +0000 |
| commit | ad78155c22cddd897b0db385859dbc54108a2fac (patch) | |
| tree | 25331b8249d73a72b82832d5592132862c1e8e40 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1648a399324721ff5b2b799d5c01e0bc56fd8192 (diff) | |
| parent | d7f36121f64fbbfaf640f073e01c43441b149d97 (diff) | |
am d7f36121: am 50d0511d: Reconcile with ics-factoryrom-2-release
* commit 'd7f36121f64fbbfaf640f073e01c43441b149d97':
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