Merge "Add strings and carrier config needed network service." am: a3ccb8d854

author Malcolm Chen <refuhoo@google.com>

Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)

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

Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
author Malcolm Chen <refuhoo@google.com>
Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Malcolm Chen <refuhoo@google.com>
	Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 6 Feb 2018 23:14:06 +0000 (23:14 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history