Merge "Add slot based ICC channel APIs"

author Jordan Liu <jminjie@google.com>

Mon, 18 Mar 2019 20:38:37 +0000 (13:38 -0700)

committer android-build-merger <android-build-merger@google.com>

Mon, 18 Mar 2019 20:38:37 +0000 (13:38 -0700)
author Jordan Liu <jminjie@google.com>
Mon, 18 Mar 2019 20:38:37 +0000 (13:38 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 18 Mar 2019 20:38:37 +0000 (13:38 -0700)
diff --cc api/system-current.txt
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	Jordan Liu <jminjie@google.com>
	Mon, 18 Mar 2019 20:38:37 +0000 (13:38 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 18 Mar 2019 20:38:37 +0000 (13:38 -0700)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ITelephony.aidl	patch \|	diff1 \|	diff2 \|	blob \| history