tree f1951317a40fac4b0a41be85ae4efe3f23a674ca
parent fb8116f736f2df6d1b2f8044541390a9fd9953cb
parent 25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e
author Hung-ying Tyan <tyanh@google.com> 1284369412 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284369412 -0700

am 25b52a2f: SIP: remove dependency on javax.sip.SipException.

Merge commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e' into gingerbread-plus-aosp

* commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e':
  SIP: remove dependency on javax.sip.SipException.