commit 760235b681ea750f159cad9fdf0c41631c41e6c6
author Sunny Goyal <sunnygoyal@google.com> Fri Feb 27 22:06:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 27 22:06:15 2015 +0000
tree f2374c687741e5e60d5c3af832fb2156a200cbdd
parent 6aeafc35f0fff875affdaa311060926c2738b908
parent c63b8b82d3cd7dbb375f92cf8e3bf62d73bc0f81

am c63b8b82: (-s ours) am 633325c4: (-s ours) DO NOT MERGE: Setting workspace id as primary key

* commit 'c63b8b82d3cd7dbb375f92cf8e3bf62d73bc0f81':
  DO NOT MERGE: Setting workspace id as primary key

WallpaperPicker/res/values-fr/strings.xml

diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml
index ea07db1..37846e0 100644
--- a/WallpaperPicker/res/values-fr/strings.xml
+++ b/WallpaperPicker/res/values-fr/strings.xml
@@ -32,5 +32,5 @@
     <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
     <string name="pick_image" msgid="6704438906027442697">"Sélectionner une image"</string>
     <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
-    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recadrer le fond d\'écran"</string>
 </resources>