am 7d0bdfaf: Merge change 26948 into eclair

Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp

* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
  Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java

@@ -55,6 +55,7 @@ public class MediaPlayerInvokeTest extends ActivityInstrumentationTestCase2<Medi
     }
 
     // Generate a random number, sends it to the ping test player.
+    @Suppress
     @MediumTest
     public void testPing() throws Exception {
         mPlayer.setDataSource("test:invoke_mock_media_player.so?url=ping");