[automerger skipped] Merge "Move nist-sip from ext.jar to voip-common.jar" am:...
[automerger skipped] Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b2 am: dd650896 am: 02a4c5ed
am: fe418b9d -s ours
am skip reason: change_id Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a with SHA1 18f58774 is in history
Change-Id: I9221b6e2a503e795b692e6a99464e0e5a1c89dbc