am 5f2ae667: am 76bb9a36: Merge change I1932e8f8 into eclair

Merge commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2' into eclair-mr2-plus-aosp

* commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.

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

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