am 1615ccc8: am e1df8224: Merge change 23173 into donut

Merge commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf' into eclair-plus-aosp

* commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.

tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java

@@ -67,7 +67,8 @@ public class LifecycleTest extends ActivityTestsBase {
         runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);
     }
 
-    @LargeTest
+    //flaky test, removing from large suite until 1866891 is fixed
+    //@LargeTest
     public void testDialog() throws Exception {
         mIntent = mTopIntent;
         runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG);