Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs

3 files changed, 20 insertions, 19 deletions

diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index 1b6da06d1380..01be062b0f1c 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -897,11 +897,14 @@ disables this mode when the window is no longer in focus.
 <h2 id="vr">VR Support</h2>
 
 <p>
-Leveraging the <a href="#sustained_performance_api">Sustained Performance API</a>
-and newly introduced {@code VrListenerService} class, Android N provides support for
-VR apps developed using the <a href="https://developers.google.com/cardboard/overview">Cardboard
-SDK</a>. For more information about the {@code VrListenerService} class, see the relevant section
-of the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Reference</a>.
+Android N adds platform support and optimizations for a new VR Mode to let developers
+build high-quality mobile VR experiences for users. There are a number of performance
+enhancements, including access to an exclusive CPU core for VR apps.
+Within your apps, you can take advantage of intelligent head-tracking,
+and stereo notifications that work for VR. Most importantly, Android N provides for
+very low latency graphics. For complete information about building VR apps for Android N,
+see the <a href="https://developers.google.com/vr/android/">Google VR SDK for Android</a>.
+</p>
 
 
 <h2 id="print_svc">Print Service Enhancements</h2>
@@ -951,9 +954,8 @@ of the downloadable <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API Refer
 The FrameMetricsListener API allows an app to monitor its UI rendering
 performance. The API provides this capability by exposing a streaming Pub/Sub API to transfer frame
 timing info for the app's current window. The data returned is
-equivalent to that displayed by {@code
-<a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a> dumpsys gfxinfo framestats},
-but is not limited to the past 120 frames.
+equivalent to that which <code><a href="{@docRoot}tools/help/shell.html#shellcommands">adb shell</a>
+dumpsys gfxinfo framestats</code> displays, but is not limited to the past 120 frames.
 </p>
 
 <p>
diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index 110ad5f5aeea..66dce7a5d0be 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -56,14 +56,13 @@ page.image=images/cards/card-n-changes_2x.png
 </p>
 
 
-<h2 id="perf">Performance Improvements</h2>
+<h2 id="perf">Battery and Memory</h2>
 
 <p>
-  Android N contains system behavior changes aimed at improving the battery
-  life of devices, RAM usage, and app performance. These changes can impact the
-  availability of system resources and system notifications to your app. You
-  should review these changes and evaluate how your app may need to adjust to
-  them.
+Android N includes system behavior changes aimed at improving the battery life
+of devices and reducing RAM usage. These changes can affect your app’s access to
+system resources, along with the way your app interacts with other apps via
+certain implicit intents.
 </p>
 
 <h3 id="doze">Doze</h3>
@@ -139,7 +138,7 @@ page.image=images/cards/card-n-changes_2x.png
 </p>
 
 <p>
-  Similarly, apps can register to receive implicit {@link
+  Similarly, in previous versions of Android, apps could register to receive implicit {@link
   android.hardware.Camera#ACTION_NEW_PICTURE} and {@link
   android.hardware.Camera#ACTION_NEW_VIDEO} broadcasts from other apps, such as
   Camera. When a user takes a picture with the Camera app, these apps wake up
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index 60568acf2cd1..13e89893d987 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -91,11 +91,11 @@ Android N Preview SDK in Android Studio as follows:</p>
   </tr>
   <tr>
     <td style="white-space: nowrap">
-    <a href="{@docRoot}shareables/preview/n-preview-2-docs.zip"
-      >n-preview-2-docs.zip</a></td>
+    <a href="{@docRoot}shareables/preview/n-preview-3-docs.zip"
+      >n-preview-3-docs.zip</a></td>
     <td width="100%">
-      MD5: c02732760f468bd97cd94c1b76361229<br>
-      SHA-1: 591eabe168c909799f6d8dcbe7b126c25ea8b04d
+      MD5: 19bcfd057a1f9dd01ffbb3d8ff7b8d81<br>
+      SHA-1: 9224bd4445cd7f653c4c294d362ccb195a2101e7 
     </td>
   </tr>
 <table>