commit 28330115cf93ec16b0b257b4d819f3238e7e4323
author Tatsuhisa Yamaguchi <yamaguchi@google.com> Tue Sep 15 15:57:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 15 15:57:49 2015 +0000
tree 9070577b1ced24f7a706e5017461d5618f04e4cc
parent 2fed8096b799b470ce934465d89b4c3d8902fed1
parent 8d8a78064f11925c9d219700fc53a3d59386e06c

am 8d8a7806: am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest.

* commit '8d8a78064f11925c9d219700fc53a3d59386e06c':
  Fix build error in ExtractDecodeEditEncodeMuxTest.

tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java

diff --git a/tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java b/tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
index 7eb70fd..8650d20 100644
--- a/tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
+++ b/tests/tests/media/src/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
@@ -20,6 +20,8 @@
 import android.content.res.AssetFileDescriptor;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
+import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecInfo.CodecProfileLevel;
 import android.media.MediaCodecList;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;