diff options
| author | Cameron Neale <cdneale@google.com> | 2014-11-05 19:34:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-05 19:34:16 +0000 |
| commit | 00e727ebf6cd303ca75f9d270c2359797e4d556b (patch) | |
| tree | a8d2828e38ec222c29eb60c7f0beafee2137282d /res | |
| parent | 318198d4629dae959a2237e335a40b4b6325c476 (diff) | |
| parent | 2775cb34b390ad52d0920bb533232571568c3f71 (diff) | |
| download | android_packages_apps_Trebuchet-00e727ebf6cd303ca75f9d270c2359797e4d556b.tar.gz android_packages_apps_Trebuchet-00e727ebf6cd303ca75f9d270c2359797e4d556b.tar.bz2 android_packages_apps_Trebuchet-00e727ebf6cd303ca75f9d270c2359797e4d556b.zip | |
Merge "Changes made to accomodate GSA in Google3 w/ Robolectric" into ub-now-master
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b3abe8fac..c5f17ac63 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,7 +258,6 @@ s --> <string name="cling_dismiss">OK</string> <!-- Error message on dummy custom cling layout [DO NOT TRANSLATE] --> <string name="dummy_custom_cling_error_message">Error: custom workspace layout passed in but custom cling was not overwritten</string> - <add-resource type="string" name="default_folder_name" /> <!-- Folder accessibility --> <!-- The format string for when a folder is opened, speaks the dimensions --> |