summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-06 20:16:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-06 20:16:51 -0700
commit6ea9a4dad692bd09c4e346fe0183a286af9d0970 (patch)
tree6ca016689d76855a34a6cd944e00a19b1cb92bcd /opengl/tests/gl_basic/gl_basic.cpp
parent1f92dbb42475c3b1d5901a9286516e581e45216e (diff)
parent60382f0550a59f4514b1854af92873c7cb5430fc (diff)
am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread
Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp * commit '960b31e3b3b40f92665be4b7a79da7f05ea19751': SipService: unset session listener if listener is gone.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions