summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorrepo sync <chiachi@android.com>2010-09-22 23:17:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-22 23:17:24 -0700
commitcefce2967ebdcb408f33f0132f44edab42268f02 (patch)
treeb384ee75405465b41a55c0fb82ddf0b3f16b7dd1 /opengl/tests/gl_basic/gl_basic.cpp
parente73d757d266d4f60c3167bbd915d531028a43d2d (diff)
parent938db5b127c9d1613c9b4df771aff801a11a83c9 (diff)
am 75c3853e: Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
Merge commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92' into gingerbread-plus-aosp * commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92': SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp. SDP: Add a simple class to help manipulate session descriptions. RTP: Add log throttle for "no data". RTP: Update native part to reflect the API change. RTP: Add two getters to retrieve the current configuration from AudioStream. RTP: Extend codec capability and update the APIs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions