summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-11-01 17:10:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-01 17:10:39 +0000
commita0824452d5c511acc7d11396ff2e6423f7b03948 (patch)
treec4681eeb192bf94759d9790ec34c685c6218634f /opengl/java/android/opengl/Texture.java
parent3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf (diff)
parent9eb4c891a3db118f2546af7593c6251f3210f3ef (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions