am 8c937a17: Merge change 22379 into donut

Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
index ea42f53..dcb8c43 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
@@ -435,6 +435,13 @@
     @LargeTest
     public void testLocalMp3PrepareAsyncCallback() throws Exception {
         boolean onPrepareSuccess = 
+            CodecTest.prepareAsyncCallback(MediaNames.MP3CBR, false);
+        assertTrue("LocalMp3prepareAsyncCallback", onPrepareSuccess);
+    }
+
+    @LargeTest
+    public void testLocalH263AMRPrepareAsyncCallback() throws Exception {
+        boolean onPrepareSuccess =
             CodecTest.prepareAsyncCallback(MediaNames.VIDEO_H263_AMR, false);
         assertTrue("LocalMp3prepareAsyncCallback", onPrepareSuccess);
     }