sync from main

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="36"
+          android:versionCode="37"
-          android:versionName="1.1.13">
+          android:versionName="1.1.14">
 
   <!-- Permissions to initialize service -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

MyTracks/res/values/strings.xml

@@ -911,6 +911,10 @@ limitations under the License.
       Screenshot: menu_record_track.png">
     Record track
   </string>
+  <string name="menu_search"
+    translation_description="In the menu, to start a textual search for tracks or waypoints.">
+    Search
+  </string>
   <string name="menu_sensor_state"
     translation_description="In the menu, to go to the sensor state page.
 
@@ -935,10 +939,6 @@ limitations under the License.
       Screenshot: menu_record_track.png">
     Tracks
   </string>
-  <string name="menu_search"
-    translation_description="In the menu, to start a textual search for tracks or waypoints.">
-    Search
-  </string>
 
   <!-- My Location -->
   <string name="my_location_approximate_location"
@@ -1097,20 +1097,20 @@ limitations under the License.
   </string>
 
   <!-- Search interface -->
+  <string name="search_global_description"
+    translation_description="Description of what is searched in My Tracks, to be displayed in the
+      global system search settings.">
+    My Tracks tracks and waypoints
+  </string>
   <string name="search_hint"
     translation_description="The hint shown on the search box until the user types a search query.
       See suggestion at http://developer.android.com/guide/topics/search/search-dialog.html about
       keeping this consistent with other Android apps.">
     Search My Tracks tracks and waypoints
   </string>
-  <string name="search_global_description"
-    translation_description="Description of what is searched in My Tracks, to be displayed in the
-      global system search settings.">
-    My Tracks tracks and waypoints
-  </string>
   <string name="search_voice_prompt"
-    translation_description="Prompt shown when the user activates voice search, asking him to
+    translation_description="Prompt shown when the user activates voice search, asking him to speak
-      speak what will be searched for.">
+      what will be searched for.">
     Speak the name of a track or waypoint.
   </string>