Merge heads

This commit is contained in:
youtaol
2012-06-25 11:08:12 +08:00
parent b337da3719
commit 1c20addf6d
122 changed files with 854 additions and 1252 deletions
@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
@@ -30,6 +31,7 @@ public class SaveToSdCardTest extends ActivityInstrumentationTestCase2<TrackList
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public SaveToSdCardTest() {
super(TrackListActivity.class);
}