summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@android.com>2010-04-08 16:39:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-08 16:39:50 -0700
commit5313fd997b1dbb49218486dbcce24500a7337e3b (patch)
tree229295aefabe8d17b5109d8d6707cb3d028b92a4 /opengl/tests/gl_basic/gl_basic.cpp
parent8a3b2cf4c86dfb08469f58459410ec778559ea61 (diff)
parent399d2f06dac18f8588a18e7fef58e82b6d853c99 (diff)
am 185f1a96: Merge "IME test fixes." into froyo
Merge commit '185f1a96683f59e2ff617b688449fd490e364be7' into froyo-plus-aosp * commit '185f1a96683f59e2ff617b688449fd490e364be7': IME test fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions