Hung-ying Tyan db4245291b am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread ...

* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
  Do not suppress error feedback during a SIP call.

2010-12-01 09:21:36 -08:00

..

android/telephony

resolved conflicts for merge of 8484e57f to master

2010-11-22 16:43:59 -08:00

com/android/internal/telephony

am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread

2010-12-01 09:21:36 -08:00