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

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

Change-Id: I55a7ea6b844fa0ba43dc42d2c342bf1867911d24