Merge "Customize the default value of Enhanced 4G LTE mode" am: 0f113b2f25

author Jordan Liu <jminjie@google.com>

Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)

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

Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)
author Jordan Liu <jminjie@google.com>
Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)
diff --cc core/java/android/provider/Settings.java

index 6dd345c,d230d2d..6b894bb

mode 100755,100644..100644
--- 1/core/java/android/provider/Settings.java
--- 2/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Jordan Liu <jminjie@google.com>
	Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history