am d7dc2c47: am baa44f11: am 773fd131: Merge change I3429f77a into eclair

Merge commit 'd7dc2c47745947b56ea33e36f69c3d8926524549'

* commit 'd7dc2c47745947b56ea33e36f69c3d8926524549':
  Suppress flaky test HeapTest#testOomeLarge.

tests/AndroidTests/src/com/android/unit_tests/HeapTest.java

@@ -485,7 +485,8 @@ public class HeapTest extends TestCase {
         }
     }
 
-    @MediumTest
+    // TODO: flaky test
+    //@MediumTest
     public void testOomeLarge() throws Exception {
         /* Just shy of the typical max heap size so that it will actually
          * try to allocate it instead of short-circuiting.