From 951c6957761d6588b26e89ddc3debb84439301a5 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 21 Jun 2012 09:51:49 -0700
Subject: [PATCH] merge heads

---
 .../apps/mytracks/endtoendtest/CreateAndSendTrackTest.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index 51023396e..743723cf6 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -163,8 +163,14 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
   public void testTrackStartTime() {
     // Delete all track first.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true);
+    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
+    
+     // Reset all settings.
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
     EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
     instrumentation.waitForIdleSync();
+    EndToEndTestUtils.SOLO.goBack();
     // Test should not show relative time.
     EndToEndTestUtils.startRecording();
     instrumentation.waitForIdleSync();