| commit | e8eded12e2d66c59b8ccb950867d447be67bfb68 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 16:49:17 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Tue Sep 22 16:49:17 2015 -0700 |
| tree | bf7cafa93c11083a01d65e3c8b931c53ffb64c74 | |
| parent | 41c30ae906f2a0e1344c42466653b269e0aa9656 [diff] | |
| parent | 4c7fd94ae9b9231281916c072f9120612e14093b [diff] |
resolved conflicts for 4c7fd94a to mnc-dev Change-Id: If60477b7839513eae9ef0b6eae0189d0407413c0
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 62f37c5..18cdf04 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,6 +427,7 @@ return; } +<<<<<<< HEAD for (String encoderName: encoderNames) { for (String decoderName: decoderNames) { doTestByName(encoderName, decoderName, mimeType, w, h);