Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp * commit '194bbcce9ba15634500f542b9ea017b2cf154b45': SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp * commit '194bbcce9ba15634500f542b9ea017b2cf154b45': SIP: longer timeout for making call, shorter for cancelling