summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-15 07:07:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 07:07:19 -0700
commitfa1cec901a5a3df6be283979a9ee732d804f32e0 (patch)
tree1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp
parent6cff3123d40cb6c21ff72e206bcdf7f869e6cda0 (diff)
parent9e0d33cebd36a0ca2d8180911f21659bcca3f620 (diff)
am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a' * commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a': SipService: deliver connectivity change to all sessions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions