Merge "A test api to override carrier information" into pi-dev

author Chen Xu <fionaxu@google.com>

Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)

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

Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
author Chen Xu <fionaxu@google.com>
Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	Chen Xu <fionaxu@google.com>
	Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
		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