commit 28c5e61eb5112e612e5d5a1824eb02581245733e
author Tom Taylor <tomtaylor@google.com> Wed Dec 07 02:49:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 07 02:49:34 2016 +0000
tree 7691c59f08159384908a2e20ff99a2fe8b31499b
parent 47feeee8ee0c4c85e5ea38950e3f7f70987b4b20
parent 8166028e0330b9acdd4da270baa29abf280069a6

Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb
am: 8166028e03

Change-Id: I2be10933c2b692efd21ad911375232029e5e18fa

res/xml-mcc302-mnc610/mms_config.xml

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>