tree 37a5a677369065ff7e82ff7992ec4c0915de00db
parent 3c094de4a9d4793bba8f826a43ef84f509a743c4
parent f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236
author Hung-ying Tyan <tyanh@google.com> 1285703269 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285703269 -0700

am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR

Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236'

* commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236':
  SIP: add DisconnectCause.SERVER_ERROR