Merge "TelephonyManager System APIs process" into pi-dev

author sqian <shuoq@google.com>

Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)

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

Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)
author sqian <shuoq@google.com>
Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	sqian <shuoq@google.com>
	Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 19 Mar 2018 23:07:38 +0000 (23:07 +0000)
		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