From 803ed45377abd56203f9627a27ff52cf5d414240 Mon Sep 17 00:00:00 2001
From: maxbogue <maxbogue@chromium.org>
Date: Fri, 17 Apr 2015 11:21:14 -0700
Subject: [PATCH] [Sync] Fix a resource string conflict.

See bug for more information.

BUG=478170

Review URL: https://codereview.chromium.org/1090283002

Cr-Commit-Position: refs/heads/master@{#325681}
---
 chrome/android/java/strings/android_chrome_strings.grd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
index f7ee83b6a8d7..69491e8b09a6 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -946,7 +946,7 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_SYNC_PASSPHRASE_CANNOT_BE_BLANK" desc="Inform user that they cannot use a blank password [CHAR-LIMIT=40]">
         This field cannot be blank
       </message>
-      <message name="IDS_SYNC_PASSPHRASE_RESET_INSTRUCTIONS" desc="Inform the user how they can reset their passphrase if they have forgotten it.">
+      <message name="IDS_SYNC_PASSPHRASE_RESET_INSTRUCTIONS" desc="Inform the user how they can reset their passphrase if they have forgotten it." meaning="Android">
         If you've forgotten your passphrase, stop and reset Sync via <ph name="BEGIN_LINK">&lt;link&gt;</ph>Google Dashboard<ph name="END_LINK">&lt;/link&gt;</ph>.
       </message>
       <message name="IDS_SYNC_PASSPHRASES_DO_NOT_MATCH" desc="Inform user that their sync password does not match.">
-- 
2.11.4.GIT