commit 2b6528554e4cbcdea1c294647ec9ec9ad41438d7
author repo sync <chiachi@android.com> Wed Sep 22 23:17:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 22 23:17:24 2010 -0700
tree aa8a88ab848a913bdfb9a8ecc9e1e8018056acd8
parent ac487f708f7b58dbd4f3021b520c6ed5975daebe
parent 75c3853ec5e4bb306fa4a614e5005df1a4e75b92

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.