am 55df44f1: am 811954cf: Merge change I7df54f9d into eclair

Merge commit '55df44f127375f3ce6bf310d327fffc187ec8f39' into eclair-mr2-plus-aosp

* commit '55df44f127375f3ce6bf310d327fffc187ec8f39':
  Clean up name of static wallpapers.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b642ead..38f27c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,7 +31,7 @@
     <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
     <string name="wallpaper_instructions">Set wallpaper</string>
     <!-- Option in "Select wallpaper from" dialog box -->
-    <string name="pick_wallpaper">Wallpaper gallery</string>
+    <string name="pick_wallpaper">Wallpapers</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled -->
     <string name="activity_not_found">Application is not installed on your phone.</string>
     <!-- List item for configuring the current wallpaper -->