diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-12-18 00:33:22 +0059 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-12-18 00:33:22 +0059 |
| commit | 577ccb4d74d8bb27484b6d2acada2961f8b4b7e8 (patch) | |
| tree | 37173b3b42c3f64b36c453f38f1ee6119e6b5856 | |
| parent | e9724e064a92223cc93a867a1bdd28f91dc004c2 (diff) | |
| download | base-577ccb4d74d8bb27484b6d2acada2961f8b4b7e8.tar.gz | |
Fix overlooked merge conflict
| -rwxr-xr-x | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java index f292ed35c216..addedc27ddb8 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java @@ -42,10 +42,7 @@ import java.io.File; import java.util.Arrays; import android.os.Bundle; -<<<<<<< HEAD import android.os.Bundle; -======= ->>>>>>> 52140cee85d3aa2ed7501d58fa8d07788f1a4085 import junit.framework.TestSuite; import android.test.InstrumentationTestRunner; import android.test.InstrumentationTestSuite; @@ -61,10 +58,7 @@ import android.util.Log; */ public class MediaFrameworkTestRunner extends InstrumentationTestRunner { -<<<<<<< HEAD public static int mMinCameraFps = 0; -======= ->>>>>>> 52140cee85d3aa2ed7501d58fa8d07788f1a4085 public static String mTargetDir = "/sdcard/"; private static String TAG = "MediaFrameworkTestRunner"; @Override |