summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-04-28 19:38:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-28 19:38:41 -0700
commitc5ba613c0413e51373e4f4787436677a80dadf9a (patch)
tree5b6541bafd5b9e8bae33fecc67ad35f8703a1987 /opengl/tests/gl_basic/gl_basic.cpp
parentc93a781c2492def222093e46ddc252b09e333410 (diff)
parent9ee392bf965a248646a36af3ccbfe958d35b9ae0 (diff)
am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit '6483f6d546655a9579670b42d445614cab609e28' into kraken * commit '6483f6d546655a9579670b42d445614cab609e28': Fix bug 2639949 - Don't stop a Scroller early
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions