summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-12-02 17:57:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 17:57:29 -0800
commit4b747570f72b703aee5c502a400e82d4f81e1193 (patch)
treefc27ad1fd8cc5fbdfe975275db2ffc6f00c4acd9 /opengl/java/android/opengl/Texture.java
parentcab522de8515e2a530d1c02901a9132ac336675e (diff)
parent6d3e51d4c453b43b1f1950884c3d08c285d2ce90 (diff)
am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90': Fix updateDoubleTapZoom logic
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions