Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: f4d1912123

Change-Id: Id6af021c26a12fb714addb4c14cbe647e3841603
This commit is contained in:
Chen Xu
2020-05-28 02:15:36 +00:00
committed by Automerger Merge Worker

View File

@@ -7323,7 +7323,7 @@
<string name="mms_message_summary">Send &amp; receive when mobile data is off</string> <string name="mms_message_summary">Send &amp; receive when mobile data is off</string>
<!-- Cell broacast receiver package name [DO NOT TRANSLATE] --> <!-- Cell broacast receiver package name [DO NOT TRANSLATE] -->
<string name="cell_broadcast_receiver_package">com.android.cellbroadcastreceiver</string> <string name="cell_broadcast_receiver_package">com.android.cellbroadcastreceiver.module</string>
<!-- Title of a preference for whether to allow data during calls that is shown when mobile <!-- Title of a preference for whether to allow data during calls that is shown when mobile
data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is