tree c6724c2c5acca35fc4ee33db523d5f1cf20447c1
parent 8a395e7a374d260ddd86fc6bd37a6397825007cd
parent fe418b9d0435eb23198d3142764a626e991c782c
author Amit Mahajan <amitmahajan@google.com> 1571165208 -0700
committer android-build-merger <android-build-merger@google.com> 1571165208 -0700

[automerger skipped] Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201 am: dd65089678 am: 02a4c5ed58
am: fe418b9d04 -s ours
am skip reason: change_id Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a with SHA1 18f5877436 is in history

Change-Id: I9221b6e2a503e795b692e6a99464e0e5a1c89dbc