tree 3a3e8b93d010e337d289c228cd6109a2ba412d93
parent eb7a4298e6f508379afd33daf67db2845e44f373
parent 0d93a6efbc9111a1e71ca474e9dcbd59bf887275
author Hung-ying Tyan <tyanh@google.com> 1284110584 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284110584 -0700

am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread

Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp

* commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680':
  SIP: add SipErrorCode for error feedback.