resolved conflicts for merge of 456a2b86 to master

diff --cc res/values/strings.xml
index 0c866a6,4d9d57f..801183f
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -247,11 -247,7 +247,11 @@@
           present on the device, we show nothing at all. -->
      <string name="weather_fetch_failure">Weather information currently unavailable.</string>
  
-     <string name="menu_item_dock_settings">Dock settings</string>
 +    <!-- String matching the lock screen format for displaying the date. -->
 +    <string name="full_wday_month_day_no_year" translatable="false">EEEE, MMMM d</string>
 +
+     <string name="menu_item_dock_settings" msgid="9161438664257429372">Dock settings</string>
 +
  </resources>