[automerger skipped] Merge "Add nist-sip as static lib since ext.jar does not include it anymore." am: e01e72e5e3 am: 0175689d85 am: 0743492996
am: 50e3ac9499 -s ours
am skip reason: change_id I2de0932e1a6342e655d55a37f609717239482c8f with SHA1 f7ee336c9e is in history

Change-Id: I8da1eac284e6e70a3687f628c0e5e24c1f831ca3
tree: cf3f88a4f5c9fd786ab67abc2bd065bae5e753c2
  1. src/
  2. Android.bp
  3. CleanSpec.mk