summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <invisiblek@cyanogenmod.org>2016-12-05 20:36:34 -0600
committerDan Pasanen <invisiblek@cyanogenmod.org>2016-12-05 20:36:34 -0600
commit09edb9fe40b0201e5932e9ae5f19f6dc267457e8 (patch)
tree788ccd8bc34af0fa1b55269998c4aeb8d4c1ea52
parentae7e942b655ab7da86edc724f95ebe4f44a55984 (diff)
parent1156cd7408bdb85711f28afa73392a5b0a912417 (diff)
downloadandroid_packages_apps_Messaging-09edb9fe40b0201e5932e9ae5f19f6dc267457e8.tar.gz
android_packages_apps_Messaging-09edb9fe40b0201e5932e9ae5f19f6dc267457e8.tar.bz2
android_packages_apps_Messaging-09edb9fe40b0201e5932e9ae5f19f6dc267457e8.zip
Merge tag 'android-7.1.1_r4' into cm-14.1
Android 7.1.1 release 4 # gpg: Signature made Thu Dec 1 13:07:05 2016 CST # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
-rw-r--r--res/xml-mcc302-mnc610/mms_config.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/res/xml-mcc302-mnc610/mms_config.xml b/res/xml-mcc302-mnc610/mms_config.xml
index 576b5c1..7c0183e 100644
--- a/res/xml-mcc302-mnc610/mms_config.xml
+++ b/res/xml-mcc302-mnc610/mms_config.xml
@@ -50,6 +50,4 @@
<!-- Disable SMS to MMS conversion for multiple recipient SMS -->
<bool name="enableGroupMms">false</bool>
- <!-- Disable the link to the cell broadcast -->
- <bool name="config_cellBroadcastAppLinks">false</bool>
</mms_config>