summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-05-26 11:39:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-26 11:39:10 -0700
commitfbb71d251bc9e72161ea919d37a20ad1277c878e (patch)
tree3f35a3c214429d18476e99d7bd0c04e957a67efd /opengl/tests/gl_basic/gl_basic.cpp
parent9bbfc2c412deb47bb82b389347eb4bc7bdb563ef (diff)
parentbe87c6df400ab01bb65899cbc69653d3c59bc4e8 (diff)
am 92693bce: (-s ours) am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
* commit '92693bce936c1cdbfd9e1b81c4eaf1fe9cf5568e': Fix focused application handle. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions