summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-10-19 09:18:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-19 09:18:32 -0700
commit87f68f186be12bf8b21e5a59d50fdf4c26e992da (patch)
tree215fd459ecce5fab287e51e18c3db62cd20ebb69 /res
parent06daf3ca086932a150c9413c1756c534755941d8 (diff)
parentea77b790e4ba0b56fb7e43c48b91817d260dd753 (diff)
downloadandroid_packages_apps_Trebuchet-87f68f186be12bf8b21e5a59d50fdf4c26e992da.tar.gz
android_packages_apps_Trebuchet-87f68f186be12bf8b21e5a59d50fdf4c26e992da.tar.bz2
android_packages_apps_Trebuchet-87f68f186be12bf8b21e5a59d50fdf4c26e992da.zip
am ea77b790: am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev
* commit 'ea77b790e4ba0b56fb7e43c48b91817d260dd753': Bring dummy cling strings back as 'strings'
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04e45ae01..0ea12c4ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -266,12 +266,12 @@ s -->
<!-- Clings -->
<!-- Dummy string [CHAR_LIMIT=40] -->
- <add-resource type="string" name="custom_workspace_cling_title_1"/>
+ <string name="custom_workspace_cling_title_1"></string>
<!-- Dummy string [CHAR_LIMIT=60] -->
- <add-resource type="string" name="custom_workspace_cling_description_1"/>
+ <string name="custom_workspace_cling_description_1"></string>
<!-- Dummy string [CHAR_LIMIT=40] -->
- <add-resource type="string" name="custom_workspace_cling_title_2"/>
+ <string name="custom_workspace_cling_title_2"></string>
<!-- Dummy string [CHAR_LIMIT=60] -->
- <add-resource type="string" name="custom_workspace_cling_description_2"/>
+ <string name="custom_workspace_cling_description_2"></string>
</resources>