| commit | fa6c1539bf424a055d3f6ee9024dd48c32a2553c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 02:06:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 02:06:19 2015 +0000 |
| tree | 46df2803f0376ed9581cbd9af6bd43112c5eae44 | |
| parent | 550bbbf316da4e219dcaa7dcf4d6d8aabbc40b6e [diff] | |
| parent | 97836b1e03080d6e1d702acd253dfad9e5e2599f [diff] |
am 97836b1e: am 80c60902: am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev * commit '97836b1e03080d6e1d702acd253dfad9e5e2599f': DO NOT MERGE: fix breakage
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);