Merge 130064 - Changes the maximize button to only minimize for panels. This resulted

ash/ash_strings.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 This file contains the strings for ash.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <output filename="grit/ash_strings.h" type="rc_header">
@@ skipping 164 matching lines @@
       </message>
 
       <message name="IDS_AURA_SET_DESKTOP_WALLPAPER" desc="The label used for change wallpaper in context menu">
         Set Wallpaper...
       </message>
 
       <message name="IDS_FRAME_MAXIMIZE_BUTTON_TOOLTIP" desc="Tooltip for the maximize/restore button in window frames in aura">
         Pull down to minimize, left or right to tile
       </message>
 
-      <message name="IDS_FRAME_MAXIMIZE_BUTTON_NO_SIDE_SNAP_TOOLTIP" desc="Tooltip for the maximize/restore button in window frames in aura when side snap is not allowed">
-        Pull down to minimize
-      </message>
-
       <!-- Status tray items -->
       <message name="IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME" desc="The accessible name of the status tray.">
         Status tray
       </message>
       <message name="IDS_ASH_STATUS_TRAY_SETTINGS_AND_HELP" desc="The label used for the help-and-settings item in the status tray.">
         Settings and Help
       </message>
       <message name="IDS_ASH_STATUS_TRAY_SHUT_DOWN" desc="The label used for the button in the status tray to shut down the system.">
         Shut down
       </message>
@@ skipping 109 matching lines @@
       <message name="IDS_ASH_SECONDARY_MONITOR_SHORTCUT" desc="The shortcut text on the secondary monitors.">
         Ctrl + 
       </message>
       <message name="IDS_ASH_STATUS_TRAY_PREVIOUS_MENU" desc="The accessible text for header entries for detailed versions of status tray items.">
         Previous menu
       </message>
     </messages>
   </release>
 </grit>