summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-31 16:22:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 16:22:54 -0700
commitab2f44a0fb19defc150bd5dc781be9b95b3afaac (patch)
tree9fba693c30b79262fa29494db35e907599ce13af /opengl/tests/gl_basic/gl_basic.cpp
parent006f136d2b59c29c64bc8481ea1fd675062bd81f (diff)
parentf93a3eb96e27ab556fbd5bc8b0b715461987fc80 (diff)
am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp * commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3': Fixed single line state on TextView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions