Merge "Modify API return type and add callback."

author Sooraj Sasindran <sasindran@google.com>

Sat, 9 Mar 2019 05:44:06 +0000 (05:44 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 9 Mar 2019 05:44:06 +0000 (05:44 +0000)
author Sooraj Sasindran <sasindran@google.com>
Sat, 9 Mar 2019 05:44:06 +0000 (05:44 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 9 Mar 2019 05:44:06 +0000 (05:44 +0000)
diff --cc Android.bp
Simple merge
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/SubscriptionManager.java
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Sooraj Sasindran <sasindran@google.com>
	Sat, 9 Mar 2019 05:44:06 +0000 (05:44 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 9 Mar 2019 05:44:06 +0000 (05:44 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/SubscriptionManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history