tree 7eb04adf8fb4a5f5b2c7c89cab7a73e277d71d8f
parent 4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2
parent 0bba9535413f9ceefe03f1cef9ddaddccd05cae5
author Hung-ying Tyan <tyanh@google.com> 1291146361 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291146361 -0800

am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread

* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
  Throw proper exceptions in SipManager