tree ad32ab86628b1213408077cf48d0b242bebfa16b
parent 876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1
parent 9404e633a55cd325b57732cdd776053b3886b611
author Hung-ying Tyan <tyanh@google.com> 1284705628 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284705628 -0700

am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread

Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp

* commit '9404e633a55cd325b57732cdd776053b3886b611':
  Add timer to SIP session creation process.