Merge change 27466 into eclair

* changes:
  Turn on thubmnail capture unit test for media metadata retriever

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java

@@ -61,9 +61,8 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
     }
 
     // Test frame capture
-    // Suppressing until 1259652 is fixed.
-    @Suppress
-    public static void disableTestThumbnailCapture() throws Exception {
+    @LargeTest
+    public static void testThumbnailCapture() throws Exception {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         Log.v(TAG, "Thumbnail processing starts");
         long startedAt = System.currentTimeMillis();