Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken * commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef': Fix issue #2694643: Remove/Resolve STOPSHIP
This commit is contained in:
@@ -2514,9 +2514,6 @@ found in the list of installed applications.</string>
|
||||
<!-- Dialog title for confirmation to erase backup data from server -->
|
||||
<string name="backup_erase_dialog_message">Are you sure you want to stop backing up your settings and application data and erase all copies on Google servers?</string>
|
||||
|
||||
<!-- Do not translate. Obsolete Settings section title - STOPSHIP remove before shipping -->
|
||||
<string name="settings_section_title">Settings</string>
|
||||
|
||||
<!-- Device admin settings screen --><skip/>
|
||||
<!-- Device admin settings activity title -->
|
||||
<string name="device_admin_settings_title">Device administration settings</string>
|
||||
|
||||
Reference in New Issue
Block a user