Merge "Update ImsSsData/ImsSsInfo API based on API council feedback."

author Brad Ebinger <breadley@google.com>

Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)
author Brad Ebinger <breadley@google.com>
Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc telephony/java/android/telephony/ims/ImsCallSessionListener.java
Simple merge
author	Brad Ebinger <breadley@google.com>
	Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 4 Mar 2019 21:02:10 +0000 (21:02 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/ims/ImsCallSessionListener.java	patch \|	diff1 \|	diff2 \|	blob \| history