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.