diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 07d3b8acd85e3..0726c430a78be 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1757,10 +1757,6 @@ public class Activity extends ContextThemeWrapper
      * receive either {@link #onRestart}, {@link #onDestroy}, or nothing,
      * depending on later user activity.
      *
-     * <p>Note that this method may never be called, in low memory situations
-     * where the system does not have enough memory to keep your activity's
-     * process running after its {@link #onPause} method is called.
-     *
      * <p><em>Derived classes must call through to the super class's
      * implementation of this method.  If they do not, an exception will be
      * thrown.</em></p>
diff --git a/docs/html/preview/features/multi-window.jd b/docs/html/preview/features/multi-window.jd
index 0773b329bd7fb..fec016861e80b 100644
--- a/docs/html/preview/features/multi-window.jd
+++ b/docs/html/preview/features/multi-window.jd
@@ -138,7 +138,9 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   When the user puts an app into multi-window mode, the system notifies the
   activity of a configuration change, as specified in <a href=
   "{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime
-  Changes</a>. Essentially, this change has the same activity-lifecycle
+  Changes</a>. This also happens when the user resizes the app, or puts the app
+  back into full-screen mode.
+  Essentially, this change has the same activity-lifecycle
   implications as when the system notifies the app that the device has switched
   from portrait to landscape mode, except that the device dimensions are
   changed instead of just being swapped. As discussed in <a href=