diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-05-18 15:28:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-18 15:28:29 -0700 |
| commit | 3f253cf2d7830487c8e3f3acfa9d87665c97ea62 (patch) | |
| tree | e86cba24391b7df8f9a456ddd162fed48365a10b | |
| parent | d3c30527519cce216ff075470f5af680d89d3664 (diff) | |
| parent | fcc577b2a15c37c1bbed995c27a48594dc43dfef (diff) | |
| download | packages_apps_Settings-3f253cf2d7830487c8e3f3acfa9d87665c97ea62.zip packages_apps_Settings-3f253cf2d7830487c8e3f3acfa9d87665c97ea62.tar.gz packages_apps_Settings-3f253cf2d7830487c8e3f3acfa9d87665c97ea62.tar.bz2 | |
am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken
* commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef':
Fix issue #2694643: Remove/Resolve STOPSHIP
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2ef3383..2866f8e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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> |