summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-02-02 15:52:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-02 15:52:00 -0800
commit67cc2ff1547843025980375b7645683de53fb391 (patch)
tree957967ca93cd09aaa03a41ad7719f195496065a4 /opengl/tests/gl_basic/gl_basic.cpp
parent92f7e3e32d5dfd73238f18687a723231f2df088e (diff)
parent497b7b8ab8943ed0d8324446c222df526f15ab85 (diff)
am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
* commit '8257e4d7e2b1ac9b8310a326cf8f4b53aba760ec': DO NOT MERGE. Only scroll if the IME is open in certain cases.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions