| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index a33f014993f32ae344b84475926906e917186fe9..67e5f58402252f247a907349ea55b340fe4ec003 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -5600,12 +5600,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_FLAGS_ENABLE_PANELS_DESCRIPTION" desc="Description for the flag to enable Panel windows.">
|
| Enable Panel windows that open outside of the browser frame. Attempts to open a Panel will open a popup instead if not enabled. Panels are always enabled on the dev and canary channels.
|
| </message>
|
| - <message name="IDS_FLAGS_ENABLE_WEAVE_PAIRING_NAME" desc="Title for the flag to turn on Weave pairing">
|
| - Enable Weave pairing
|
| - </message>
|
| - <message name="IDS_FLAGS_ENABLE_WEAVE_PAIRING_DESCRIPTION" desc="Description for the flag to turn on Weave pairing">
|
| - Weave pairing is used by Weave App for secure communication with devices on local network.
|
| - </message>
|
| <message name="IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME" desc="Name of the 'Enable WebGL Draft Extensions' flag.">
|
| Enable WebGL Draft Extensions
|
| </message>
|
| @@ -15353,7 +15347,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
|
| Default (pick up everything)
|
| </message>
|
| </if>
|
| -
|
| +
|
| <if expr="is_android">
|
| <!-- Data Use -->
|
| <message name="IDS_DATA_USE_TRACKING_STARTED_SNACKBAR_MESSAGE" desc="Message shown when data use tracking starts." formatter_data="android_java">
|
|
|