summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-09-14 16:28:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-14 16:28:10 -0700
commit0cdb120b2a98423d4c66d6ae95822eba80f424c6 (patch)
tree1b4d284d76610faa682262216e18d7956df073d7 /opengl/tests/gl_basic/gl_basic.cpp
parent3af74f9874aeda22d7c383dda47aa8c18eae3147 (diff)
parentcdf8f7064e6a7ee822dbb053d8806d2cb9ffe3b4 (diff)
am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp * commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5': Complete event registration in CallManager.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions