am e785d180: Merge change 25826 into eclair

Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp

* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.

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

@@ -417,6 +417,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram
         assertTrue("Invalid video Size", isTestInvalidVideoSizeSuccessful);
     }
     
+    @Suppress
     @LargeTest
     public void testInvalidFrameRate() throws Exception {       
         boolean isTestInvalidFrameRateSuccessful = false;