Merge changes from topics "ut_provision_api", "ims_prov_api_defs" am: 3fc958475b...

author Brad Ebinger <breadley@google.com>

Thu, 24 Jan 2019 19:45:19 +0000 (11:45 -0800)

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

Thu, 24 Jan 2019 19:45:19 +0000 (11:45 -0800)
author Brad Ebinger <breadley@google.com>
Thu, 24 Jan 2019 19:45:19 +0000 (11:45 -0800)
committer android-build-merger <android-build-merger@google.com>
Thu, 24 Jan 2019 19:45:19 +0000 (11:45 -0800)
diff --cc api/current.txt

index 487dfd6,a4bb119..b9922f4

mode 100644,100755..100644
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
diff --cc api/system-current.txt
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge
author	Brad Ebinger <breadley@google.com>
	Thu, 24 Jan 2019 19:45:19 +0000 (11:45 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 24 Jan 2019 19:45:19 +0000 (11:45 -0800)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/com/android/internal/telephony/ITelephony.aidl	patch \|	diff1 \|	diff2 \|	blob \| history