OSDN Git Service

am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
authorHung-ying Tyan <tyanh@google.com>
Tue, 28 Sep 2010 06:58:08 +0000 (23:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Sep 2010 06:58:08 +0000 (23:58 -0700)
commit1e5c4fe3b434ad815bfc38e303b94643208e08ee
treee3fe56f3a9a380af64cd06de2c2cab32a08165a0
parentc11621a77d62fdd9d3736090239c7b6735b60ee5
parentced8172ac1c4b0140751e1e285d795494a206128
am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR

Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp

* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
  SIP: add DisconnectCause.SERVER_ERROR