commit | d126f667b918d52f13a7d96e2a5bcee69fe299e1 | [log] [tgz] |
---|---|---|
author | Chia-chi Yeh <chiachi@android.com> | Tue Sep 13 10:35:04 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 13 10:35:04 2011 -0700 |
tree | 348c1f14cb4dc2586e10d6d45e36f6154ae00581 | |
parent | f5d23acbc5cd6d28a72feabb8cc9ee9e8d5f7160 [diff] | |
parent | 37f93394fe5c7cfede3a780214fa99a9e2a69133 [diff] |
Merge "SIP: fix keep-alive measurement and increase the timeout."