| commit | 3011b6617232d1ef7c1687d1db9e780fce978d30 | [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 | 548e2f9a62ba24e5784175b4b947c0e75dc3fbef | |
| parent | a7936a5d6d3c989055fffa74f6c5a4b4a8c83114 [diff] | |
| parent | d6d83279183db749de07bfdac79fe4180fc848d0 [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