Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev

Author: Craig Mautner

services/java/com/android/server/am/ActivityStack.java

@@ -1794,10 +1794,6 @@ private final void startActivityLocked(ActivityRecord r, boolean newTask,
                 mService.mWindowManager.prepareAppTransition(
                         WindowManagerPolicy.TRANSIT_NONE, keepCurTransition);
                 mNoAnimActivities.add(r);
-            } else if ((r.intent.getFlags()&Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET) != 0) {
-                mService.mWindowManager.prepareAppTransition(
-                        WindowManagerPolicy.TRANSIT_TASK_OPEN, keepCurTransition);
-                mNoAnimActivities.remove(r);
             } else {
                 mService.mWindowManager.prepareAppTransition(newTask
                         ? WindowManagerPolicy.TRANSIT_TASK_OPEN