commit | e7f7f46663b03f05a99e1ec41ac99c778737b9bb | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Fri Sep 24 15:58:09 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 24 15:58:09 2010 -0700 |
tree | 4cd25458f677fb86395886c20fcf8059094ecb17 | |
parent | 4399547d67ff4e06356d5e7f559207d14774e0b8 [diff] | |
parent | 099774e68df2a89b6d49bc98756001cf73b20ba3 [diff] |
am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0' * commit 'd6d83279183db749de07bfdac79fe4180fc848d0': SIP: longer timeout for making call, shorter for cancelling