tree f11794d892ddc583de15508619a157568abbd886
parent 2ffb24799e579c47a73c992ab567f05c4bf0c962
parent 30aeb8c8547efbb1fb6c62f35df45842716a7c6d
author Hung-ying Tyan <tyanh@google.com> 1284705049 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1284705049 -0700

Merge "Add timer to SIP session creation process." into gingerbread