| commit | d52138e4a537a7a7fe3262b658bb685a164c309b | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 09:25:00 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Wed Sep 23 09:25:00 2015 -0700 |
| tree | 6ede7161dc56d3c0fa40f3f8d8684ada4b31e853 | |
| parent | e8eded12e2d66c59b8ccb950867d447be67bfb68 [diff] |
fixed build breakage Change-Id: I63458f07cb8bc2e646c8fd81b244e8b2d37953e8
diff --git a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java index 18cdf04..62f37c5 100644 --- a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java +++ b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
@@ -427,7 +427,6 @@ return; } -<<<<<<< HEAD for (String encoderName: encoderNames) { for (String decoderName: decoderNames) { doTestByName(encoderName, decoderName, mimeType, w, h);