summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-06-07 17:52:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-07 17:52:30 -0700
commit5d99f17e827a927938e450076857f4cf145074c2 (patch)
tree83782c70e05463d7dde8924ea545e9c503398211 /opengl/tests/gl_basic/gl_basic.cpp
parent76ad002c32e8075d2df29063ead951bc0e820fb1 (diff)
parentb7edd04f7adc8ed8c0c22a3c6601c22d355fc4da (diff)
am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
* commit '61220e880ac4d9d76b7fd50744439e68e929c697': Revert velocity damping. Bug: 4364920
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions