summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-25 17:01:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-25 17:01:13 -0700
commit6630f4e8513342c0a8ee5d8b4363f9c3dc9a6c58 (patch)
tree25a3e952191afbc290c5b310974da0443810c5b1
parent55b2981de8bbdd183ab411e95f5e6664e9016f94 (diff)
parentef2407a7ba954c3853ac9c69a3017de7a768c8ac (diff)
downloadandroid_packages_apps_Snap-6630f4e8513342c0a8ee5d8b4363f9c3dc9a6c58.tar.gz
android_packages_apps_Snap-6630f4e8513342c0a8ee5d8b4363f9c3dc9a6c58.tar.bz2
android_packages_apps_Snap-6630f4e8513342c0a8ee5d8b4363f9c3dc9a6c58.zip
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
* commit 'd72971e683069d463c78117037414e5286689549': Fixed crop intent.
-rw-r--r--res/values/filtershow_strings.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 42e624880..1f00e8aeb 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -16,10 +16,8 @@
<resources>
- <!-- Name for the image editor activity [CHAR LIMIT=NONE]-->
- <string name="app_name">FilterShow</string>
<!-- Title for the image editor activity [CHAR LIMIT=NONE]-->
- <string name="title_activity_filter_show">FilterShowActivity</string>
+ <string name="title_activity_filter_show">Photo Editor</string>
<!-- String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
<string name="cannot_load_image">Cannot load the image!</string>