merge heads

2012-04-04 16:54:29 -07:00
parent 1c0ce45937
commit c5fa717d55
14 changed files with 274 additions and 320 deletions
@@ -25,11 +25,6 @@ limitations under the License.
    android:id="@+id/menu_stop_recording"
    android:showAsAction="always"
    android:title="@string/menu_stop_recording"/>
-  <item
-    android:icon="@drawable/ic_menu_tracklist"
-    android:id="@+id/menu_tracks"
-    android:showAsAction="ifRoom"
-    android:title="@string/menu_tracks"/>
  <item
    android:icon="@drawable/ic_menu_waypoints"
    android:id="@+id/menu_markers"
@@ -1025,10 +1025,6 @@ limitations under the License.
    translation_description="In the menu, to stop recording a track.">
    Stop recording
  </string>
-  <string name="menu_tracks"
-    translation_description="In the menu, to show a list of all the tracks.">
-    Tracks
-  </string>

  <!-- My Location -->
  <string name="my_location_approximate_location"