tree 790317b20274aac56bcd09404726f762a1c95ca9
parent 0718be8cfa86546f2e3b0b3fd90ee092e16775ae
parent 33ab7aed8fc1c7eb547bb2497b6cdfe0d26e80e0
author Brad Ebinger <breadley@google.com> 1551735717 -0800
committer android-build-merger <android-build-merger@google.com> 1551735717 -0800

Merge "Update ImsSsData/ImsSsInfo API based on API council feedback." am: cef848b56e am: 391d3b7d44
am: 33ab7aed8f

Change-Id: I6679a07909c47f6dbaa05cf40a6568d93ab4c9bd