diff options
author | Neil Fuller <nfuller@google.com> | 2014-10-02 11:48:08 +0100 |
---|---|---|
committer | Neil Fuller <nfuller@google.com> | 2014-10-02 11:48:08 +0100 |
commit | f7cf5d43aa13405f9d0dd54f6038f710a0423323 (patch) | |
tree | 76f33c6e39a9ca49ff9c1d9d776cb86115bc7ff3 /media/tests | |
parent | 92c414724f84e32df3c0f79ce11e37ef3d481611 (diff) | |
parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 (diff) | |
download | frameworks_base-f7cf5d43aa13405f9d0dd54f6038f710a0423323.zip frameworks_base-f7cf5d43aa13405f9d0dd54f6038f710a0423323.tar.gz frameworks_base-f7cf5d43aa13405f9d0dd54f6038f710a0423323.tar.bz2 |
resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
Diffstat (limited to 'media/tests')
2 files changed, 0 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java index e6f0aaf..d12ef2e 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraFunctionalTest.java @@ -37,7 +37,6 @@ import android.os.Handler; import android.os.Looper; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.LargeTest; -import android.util.FloatMath; import android.util.Log; import android.view.SurfaceHolder; import com.android.mediaframeworktest.CameraStressTestRunner; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java index 61b708a..8f67598 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/camera/CameraPairwiseTest.java @@ -24,7 +24,6 @@ import android.os.Handler; import android.os.Looper; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.LargeTest; -import android.util.FloatMath; import android.util.Log; import android.view.SurfaceHolder; |