Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread