Merge "integrate carrier id to carrier config"

author Chen Xu <fionaxu@google.com>

Thu, 22 Nov 2018 05:06:55 +0000 (05:06 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 22 Nov 2018 05:06:55 +0000 (05:06 +0000)
author Chen Xu <fionaxu@google.com>
Thu, 22 Nov 2018 05:06:55 +0000 (05:06 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 22 Nov 2018 05:06:55 +0000 (05:06 +0000)
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>
	Thu, 22 Nov 2018 05:06:55 +0000 (05:06 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 22 Nov 2018 05:06:55 +0000 (05:06 +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