Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp * commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624': Fix issue #2694643: Remove/Resolve STOPSHIP
This commit is contained in:
@@ -2493,9 +2493,6 @@ found in the list of installed applications.</string>
|
|||||||
<!-- Dialog title for confirmation to erase backup data from server -->
|
<!-- 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>
|
<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 screen --><skip/>
|
||||||
<!-- Device admin settings activity title -->
|
<!-- Device admin settings activity title -->
|
||||||
<string name="device_admin_settings_title">Device administration settings</string>
|
<string name="device_admin_settings_title">Device administration settings</string>
|
||||||
|
Reference in New Issue
Block a user