tree 44eb778a1b9c798afe3b306be30067a9e5eb84cc
parent f8d1d27b97b57d6a4ea8f242230b5ee2f3522612
parent c9ee78f7e065cf04934f7f730b0ba0d20b66c865
author Neil Fuller <nfuller@google.com> 1537968646 -0700
committer android-build-merger <android-build-merger@google.com> 1537968646 -0700

Merge "Make nist-sip compile against public SDK APIs" am: 93dc2efaba
am: c9ee78f7e0

Change-Id: Ie03397c5a14ed1d55090a8d76b070e61a86007ec