summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-09-15 12:33:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 12:33:19 -0700
commitec921a578081f78f41d6423986f603880ee6ea20 (patch)
tree1049acf697ef2fe83a12a74bbf426b864eba5ea6 /opengl/tests/gl_basic/gl_basic.cpp
parent50c9af2b4ac3da3f6f9516cc37fbd358240b16e2 (diff)
parent0cdb120b2a98423d4c66d6ae95822eba80f424c6 (diff)
am 8028bd5b: am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '8028bd5b696fd94d33c905c4279d6505e985d70b' * commit '8028bd5b696fd94d33c905c4279d6505e985d70b': Complete event registration in CallManager.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions