summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
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
commitcef050d17abf5fb01901e4828f15c809e7896925 (patch)
treec13657903573c911c2ad799dc4fbcfdb1bad6565 /opengl/tests/gl_basic/gl_basic.cpp
parent2fe2651df02c2f02d345fcfa5d6a740435f84293 (diff)
parentd8c16f2266708b41682bd09beec0a6611fecfe89 (diff)
am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90': Fix updateDoubleTapZoom logic
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions