am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread

Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3'

* commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3':
  Add uri field to SipManager.ListenerRelay

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base