diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 2bb8480f9aefd..9095ec9906281 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -3020,9 +3020,9 @@ public class Activity extends ContextThemeWrapper
      * or {@link #finish} to specify an explicit transition animation to
      * perform next.
      * @param enterAnim A resource ID of the animation resource to use for
-     * the incoming activity.
+     * the incoming activity.  Use 0 for no animation.
      * @param exitAnim A resource ID of the animation resource to use for
-     * the outgoing activity.
+     * the outgoing activity.  Use 0 for no animation.
      */
     public void overridePendingTransition(int enterAnim, int exitAnim) {
         try {
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 78a82dd4b765a..8ebbc93d23170 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -3122,7 +3122,7 @@ public class WindowManagerService extends IWindowManager.Stub
 
     public void overridePendingAppTransition(String packageName,
             int enterAnim, int exitAnim) {
-        if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET){
+        if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
             mNextAppTransitionPackage = packageName;
             mNextAppTransitionEnter = enterAnim;
             mNextAppTransitionExit = exitAnim;
@@ -9327,7 +9327,6 @@ public class WindowManagerService extends IWindowManager.Stub
                             transit = WindowManagerPolicy.TRANSIT_UNSET;
                         }
                         mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET;
-                        mNextAppTransitionPackage = null;
                         mAppTransitionReady = false;
                         mAppTransitionRunning = true;
                         mAppTransitionTimeout = false;
@@ -9484,6 +9483,8 @@ public class WindowManagerService extends IWindowManager.Stub
                             wtoken.allDrawn = true;
                         }
 
+                        mNextAppTransitionPackage = null;
+                        
                         mOpeningApps.clear();
                         mClosingApps.clear();