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

Merge commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2' into eclair-mr2-plus-aosp

* commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2':
  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.