Hung-ying Tyan 0e58a95298 am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread ...

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

2010-11-30 11:46:01 -08:00

..

android/telephony

resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp

2010-11-22 16:32:34 -08:00

com/android/internal/telephony

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

2010-11-30 11:46:01 -08:00