Merge "Move getPhoneCount implementation back to TelephonyManager." am: 7d6e085229

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

Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)

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

Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)
author Xiangyu/Malcolm Chen <refuhoo@google.com>
Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)
committer android-build-merger <android-build-merger@google.com>
Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)
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, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)
		1	2
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ITelephony.aidl	patch \|	diff1 \|	diff2 \|	blob \| history