Merge "Add System API to enable / disable a logical modem." am: 8df9d17289

author Xiangyu/Malcolm Chen <refuhoo@google.com>

Wed, 23 Jan 2019 06:07:47 +0000 (22:07 -0800)

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

Wed, 23 Jan 2019 06:07:47 +0000 (22:07 -0800)
author Xiangyu/Malcolm Chen <refuhoo@google.com>
Wed, 23 Jan 2019 06:07:47 +0000 (22:07 -0800)
committer android-build-merger <android-build-merger@google.com>
Wed, 23 Jan 2019 06:07:47 +0000 (22:07 -0800)
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	Xiangyu/Malcolm Chen <refuhoo@google.com>
	Wed, 23 Jan 2019 06:07:47 +0000 (22:07 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 23 Jan 2019 06:07:47 +0000 (22:07 -0800)
		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