summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-10-21 09:47:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 09:47:27 -0700
commit2e6dd6150e777333591dc1468811bd83a34035d7 (patch)
tree54b76e53206c2793446cf8721ef56ae37919ca70 /opengl/tests/gl_basic/gl_basic.cpp
parentc6a98bb73d9ba63c8490fd522eb19638e7296834 (diff)
parent8ccce0fdbc1a1cb3b9eb185993b6338c134bec00 (diff)
am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
Merge commit '6799864d6c9744e4c5133a90410576b577d65de6' * commit '6799864d6c9744e4c5133a90410576b577d65de6': Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions