diff --git a/src/index.jd b/src/index.jd
index dc0aa44..c3e706f 100644
--- a/src/index.jd
+++ b/src/index.jd
@@ -25,15 +25,13 @@
   <div class="landing-banner">
       <h1 itemprop="name" style="margin-bottom:0;">Welcome to the Android Open Source Project!</h1>
 
-<p>
-Android is an open source software stack for a wide range of mobile devices and
-a corresponding open source project led by Google. This site offers the
+<p>Android is an open source software stack for a wide range of mobile devices
+and a corresponding open source project led by Google. This site offers the
 information and source code you need to create custom variants of the Android
 stack, port devices and accessories to the Android platform, and ensure your
-devices meet compatibility requirements.
-</p>
+devices meet compatibility requirements.</p>
 
-<h2 align="center">Android 6.0 Updates Available &mdash; see details below</h2>
+<h2 align="center">Android 7.0 Updates Available</h2>
   </div>
 
 </div>
@@ -41,8 +39,113 @@
 <div class="wrap">
 
   <div class="landing-docs">
-    <div class="col-8">
+    <div class="col-10">
     <h3>What's New</h3>
+
+<h4>Key Features</h4>
+<p>
+<a href="{@docRoot}devices/tech/dalvik/jit-compiler.html"><strong>Just-in-time
+(JIT) compiler</strong></a> with code profiling to Android runtime (ART)
+continually improves app performance.
+<a href="{@docRoot}security/encryption/file-based.html"><strong>Direct boot and
+file-based encryption</strong></a> allows certain apps to run securely when
+the device is powered on but not unlocked.
+<a href="{@docRoot}devices/tech/display/multi-window.html"><strong>Multi-window</strong></a>
+support enables simultaneous display of multiple apps on a device screen.
+The <a href="{@docRoot}devices/automotive.html"><strong>Vehicle
+HAL</strong></a> enables Android Automotive implementations.</p>
+
+<h4>Security Improvements</h4>
+<p>
+Android now strictly enforces
+<a href="{@docRoot}security/verifiedboot/verified-boot.html"><strong>verified
+boot</strong></a> and requires a
+<a href="{@docRoot}security/overview/app-security.html#certificate-authorities"><strong>same-system
+trusted CA store</strong></a>.
+<a href="{@docRoot}security/apksigning/index.html#v2"><strong>APK signature
+scheme v2</strong></a> performs signature checking across the entire file.
+Security hardening of <a href="{@docRoot}devices/media/framework-hardening.html"><strong>media
+framework</strong></a> and
+<a href="{@docRoot}devices/camera/versioning.html#hardening">camera service</strong></a>
+splits mediaserver into multiple processes with restricted permissions and
+capabilities (may require changes to HAL implementations).
+For more changes, see
+<a href="{@docRoot}security/enhancements/enhancements70.html"><strong>7.0
+security enhancements</strong></a>.</p>
+
+<h4>Audio, Camera, &amp; Graphics Updates</h4>
+<p>
+<a href="{@docRoot}devices/audio/implement-policy.html"><strong>Audio policy
+improvements</strong></a> include changes to policy configuration files, a
+reorganization of audio policy code, and new extensions for audio policy routing
+APIs.
+Android now supports
+<a href="{@docRoot}devices/graphics/arch-vulkan.html"><strong>Vulkan</strong></a>
+(low­-overhead, cross-platform API for high-performance 3D graphics) and
+<a href="{@docRoot}devices/graphics/testing.html"><strong>OpenGL
+3.2</strong></a>; check with your SoC for driver support.
+Enhancements to
+<a href="{@docRoot}devices/camera/versioning.html"><strong>camera3</strong></a>
+support devices with high-end cameras.</p>
+
+<h4>OEM Customizations</h4>
+<p>Users can now
+<a href="{@docRoot}devices/tech/connect/block-numbers.html"><strong>restrict
+calls and texts</strong></a> (impacts apps using blocking features).
+Do-not-disturb (DND) rules can now
+<a href="{@docRoot}devices/tech/display/dnd.html"><strong>suppress visual
+interruptions</strong></a>.</p>
+
+<h4>Android For Work Updates</h4>
+<p>New device administration features include
+<a href="{@docRoot}devices/tech/admin/enterprise-telephony.html"><strong>enterprise
+telephony</strong></a> (cross-profile contact searching and badging, affects
+preloaded Dialer and Contacts apps),
+<a href="{@docRoot}devices/tech/admin/implement.html#HAL_values"><strong>device
+monitoring and health reporting</strong></a> (APIs for apps to query device
+hardware state; device must report correct values in the HAL implementation),
+and
+<a href="{@docRoot}devices/tech/admin/testing-setup.html#troubleshooting"><strong>enterprise
+process logging and device owner triggered bugreports</strong></a> (collect logs
+for user actions on a managed device).</p>
+
+<h4>Power Improvements</h4>
+<p>
+<a href="{@docRoot}devices/tech/power/mgmt.html#doze"><strong>Doze</strong></a>
+now works on devices in motion.
+<a href="{@docRoot}devices/tech/power/mgmt.html#sustained_performance"><strong>Sustained
+performance</strong></a> hints can inform long-running applications of
+device-performance capabilities (requires power HAL changes).
+<a href="{@docRoot}devices/tech/connect/data-saver.html"><strong>Data
+Saver</strong></a> enables restricting background data when on cellular or
+metered networks.
+Android now collects data for
+<a href="{@docRoot}devices/tech/power/values.html#le-bt-scans"><strong>Low
+Energy (LE) scans and Bluetooth</strong></a> traffic.</p>
+
+<h4>Under the Hood</h4>
+<p>Dialer APIs handle all
+<a href="{@docRoot}devices/tech/connect/call-notification.html"><strong>call
+notification</strong></a> logic (instead of sharing with Telecom).
+<a href="{@docRoot}devices/tech/config/namespaces_libraries.html"><strong>Namespaces
+for native libraries</strong></a> prevent apps from using private platform
+native APIs.
+<a href="{@docRoot}source/running.html#flashing-a-device"><strong>Flash
+unlock</strong></a> reports the bootloader's lock status.
+<a href="{@docRoot}devices/tech/connect/ril.html"><strong>Radio
+Interface Layer (RIL)</strong></a> support includes enhancements to error codes,
+versioning, and wakelocks.
+<a href="{@docRoot}devices/tech/config/uicc.html"><strong>UICC carrier
+privilege</strong></a> rules now support Access File Rule (ARF) storage.
+Android now supports the RFID smart card system
+<a href="{@docRoot}devices/tech/connect/felica.html"><strong>Felicity Card
+(FeliCa)</strong></a>.
+Documentation updated for
+<a href="{@docRoot}devices/halref/index.html"><strong>HAL</strong></a>
+and <a href="{@docRoot}reference/packages.html"><strong>TradeFed</strong></a>
+references.</p>
+
+<!--SAVED for FUTURE REFERENCE
 <a href="{@docRoot}source/build-numbers.html">
         <h4>Lollipop and Marshmallow Build Numbers</h4></a>
         <p>New <strong><a
@@ -56,83 +159,49 @@
         <p>Android 6.0 R3, 5.1 R5, and 5.0 R4 Compatibility Test Suite (CTS)
         and CTS Verifier are available for <strong><a
         href="{@docRoot}compatibility/downloads.html">Download</a></strong>.</p>
+-->
+</div>
 
-<a href="{@docRoot}source/initializing.html">
-        <h4>JDK 8 for Latest Platform Development</h4></a>
-        <p>The master branch of Android now requires JDK 8 to build. See <strong><a
-        href="{@docRoot}source/requirements.html">Requirements</a></strong>
-        for a summary of Java versions by Android release. See <strong><a
-        href="{@docRoot}source/initializing.html#installing-the-jdk">Setting up
-        a Linux build environment</a></strong> or <strong><a
-        href="{@docRoot}source/initializing.html#installing-the-mac-jdk">Setting up a
-        Mac OS build environment</a></strong> for update instructions by operating system.</p>
+<div class="col-5">
 
-<a href="{@docRoot}source/read-bug-reports.html">
-        <h4>Reading Bug Reports</h4></a>
-        <p>Android Engineering has written a detailed guide for <strong><a
-        href="{@docRoot}source/read-bug-reports.html">understanding
-        device-generated bug reports</a></strong>. This guide describes and
-        provides examples of common errors and their associated causes, such as
-        <strong><a href="{@docRoot}source/read-bug-reports.html#memory">low
-        memory</a></strong>. It even explains how to establish a <strong><a
-        href="{@docRoot}source/read-bug-reports.html#narrative">narrative</a></strong>
-        of the issue by syncing timelines across logs.</p>
+<h3>Getting Started</h3>
+<a href="{@docRoot}source/index.html"><h4>Explore the Source</h4></a>
+<p>Get the complete Android platform and modify and build it to suit your needs.
+You can also
+<strong><a href="https://android-review.googlesource.com/#/q/status:open">contribute
+to</a></strong> the <strong><a href="https://android.googlesource.com/">Android
+Open Source Project (AOSP) repository</a></strong> to make your changes
+available to everyone else in the Android ecosystem.</p>
 
-<a href="{@docRoot}compatibility/cts/rotation-vector.html">
-        <h4>Rotation Vector CV Crosscheck</h4></a>
-        <p>Instructions now exist for the CTS Verifier <strong><a
-        href="{@docRoot}compatibility/cts/rotation-vector.html">Rotation Vector
-        CV Crosscheck</a></strong> used to properly test the compatibility of rotation
-        vector sensor implementations.</p>
+<a href="{@docRoot}source/index.html"><img border="0"
+src="images/android_framework_small.png" alt="Android framework summary"
+style="display:inline;float:right;margin:5px 10px;width:42%;height:42%"></a>
 
-<a href="{@docRoot}security/bulletin/index.html">
-        <h4>Security Bulletins</h4></a>
-        <p>The Android security team now publishes monthly <strong><a
-        href="{@docRoot}security/bulletin/index.html">Nexus Security
-        Bulletins</a></strong> describing key vulnerabilities fixed in AOSP
-        with links to associated changes.</p>
-    </div>
+<a href="{@docRoot}devices/index.html"><h4>Port Android to Devices</h4></a>
+<p>Get help porting the latest Android platform to create compelling devices for
+your customers. Includes documentation for HAL interfaces and details on core
+technologies such as Android runtime (ART) and over-the-air (OTA) updates.</p>
 
-    <div class="col-8">
-      <h3>Getting Started</h3>
-      <a href="{@docRoot}source/index.html">
-        <h4>Explore the Source</h4></a>
-        <p>Get the complete Android platform and modify and build it to suit your needs. You can
-        also <strong><a
-        href="https://android-review.googlesource.com/#/q/status:open">contribute
-        to</a></strong> the <strong><a
-        href="https://android.googlesource.com/">Android Open Source Project (AOSP)
-        repository</a></strong> to make your changes available to everyone else
-        in the Android ecosystem.</p>
-<a href="{@docRoot}source/index.html"><img border="0" src="images/android_framework_small.png" alt="Android framework summary" style="display:inline;float:right;margin:5px 10px;width:42%;height:42%"></a>
-      <a href="{@docRoot}devices/index.html">
-        <h4>Port Android to Devices</h4></a>
-        <p>Port the latest Android platform and
-        create compelling devices that your customers want.</p>
+<a href="{@docRoot}security/index.html"><h4>Make Secure</h4></a>
+<p>Follow these examples and instructions to harden your Android devices against
+malicious attacks. Find out how the Android security program works and learn how
+to implement the latest features.</p>
 
-      <a href="{@docRoot}security/index.html">
-        <h4>Make Secure</h4></a>
-	<p>Follow these examples and instructions to harden your Android
-          devices against malicious attacks. Find out how the Android security program
-          works and learn to implement the latest features.</p>
+<a href="{@docRoot}compatibility/index.html"><h4>Get Compatible</h4></a>
+<p>Being Android-compatible lets you offer custom features but still give users
+and developers a consistent and standard experience across all Android-powered
+devices. Android provides guidance and a test suite to verify your Android
+compatibility.</p>
 
-      <a href="{@docRoot}compatibility/index.html">
-        <h4>Get Compatible</h4></a>
-        <p>Being Android-compatible lets you offer custom features but still give users and developers a consistent
-          and standard experience across all Android-powered devices. Android provides guidance
-          and a test suite to verify your Android compatibility.</p>
+<a href="https://android.googlesource.com/platform/docs/source.android.com/">
+<h4>Help this Site</h4></a>
+<p>Use the <strong>Site Feedback</strong> button at the bottom of any page to
+request content improvements or let us know about errors. To contribute your
+own updates to the site or to view a complete list of site changes, use the AOSP
+project
+<strong><a href="https://android.googlesource.com/platform/docs/source.android.com/+log/master">docs/source.android.com.</a></strong></p>
+</div>
 
-      <a href="https://android.googlesource.com/platform/docs/source.android.com/">
-        <h4>Help this Site</h4></a>
-        <p>Use the <strong>Site Feedback</strong> button at the bottom of any
-        page to request improvements to the content or identify errors. In addition,
-        source.android.com is maintained in the Android Open Source Project. See the
-        <strong><a
-        href="https://android.googlesource.com/platform/docs/source.android.com/+log/master">docs/source.android.com
-        project log in AOSP</a></strong> for the complete list of changes to this site.
-        Contribute your own updates to that same project and help maintain source.android.com.</p>
-    </div>
-
-  </div>
+</div>
 
 </div>
diff --git a/src/security/enhancements/enhancements70.jd b/src/security/enhancements/enhancements70.jd
new file mode 100644
index 0000000..88d4763
--- /dev/null
+++ b/src/security/enhancements/enhancements70.jd
@@ -0,0 +1,53 @@
+page.title=Security Enhancements in Android 7.0
+@jd:body
+<!--
+    Copyright 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<p>Every Android release includes dozens of security enhancements to protect
+users. Here are some of the major security enhancements available in Android
+7.0:</p>
+
+<ul>
+  <li><strong>File-based encryption</strong>. Encrypting at the file level,
+  instead of encrypting the entire storage area as a single unit, better
+  isolates and protects individual users and profiles (such as personal and
+  work) on a device.</li>
+  <li><strong>Direct Boot</strong>. Enabled by file-based encryption, Direct
+  Boot allows certain apps such as alarm clock and accessibility features to
+  run when device is powered on but not unlocked.</li>
+  <li><strong>Verified Boot</strong>. Verified Boot is now strictly enforced to
+  prevent compromised devices from booting; it supports error correction to
+  improve reliability against non-malicious data corruption.</li>
+  <li><strong>SELinux</strong>. Updated SELinux configuration and increased
+  seccomp coverage further locks down the application sandbox and reduces attack
+  surface.</li>
+  <li><strong>Library load-order randomization and improved ASLR</strong>.
+  Increased randomness makes some code-reuse attacks less reliable.</li>
+  <li><strong>Kernel hardening</strong>. Added additional memory protection for
+  newer kernels by marking portions of kernel memory as read-only, restricting
+  kernel access to userspace addresses and further reducing the existing attack
+  surface.</li>
+  <li><strong>APK signature scheme v2</strong>. Introduced a whole-file signature
+  scheme that improves verification speed and strengthens integrity guarantees.</li>
+  <li><strong>Trusted CA store</strong>. To make it easier for apps to control
+  access to their secure network traffic, user-installed certificate authorities
+  and those installed through Device Admin APIs are no longer trusted by default
+  for apps targeting API Level 24+. Additionally, all new Android devices must
+  ship with the same trusted CA store.</li>
+  <li><strong>Network Security Config</strong>. Configure network security and TLS
+  through a declarative configuration file.</li>
+</ul>
+
diff --git a/src/security/security_toc.cs b/src/security/security_toc.cs
index 798e7e4..19070eb 100644
--- a/src/security/security_toc.cs
+++ b/src/security/security_toc.cs
@@ -32,6 +32,7 @@
           </a>
         </div>
         <ul>
+          <li><a href="<?cs var:toroot ?>security/enhancements/enhancements70.html">Android 7.0</a></li>
           <li><a href="<?cs var:toroot ?>security/enhancements/enhancements60.html">Android 6.0</a></li>
           <li><a href="<?cs var:toroot ?>security/enhancements/enhancements50.html">Android 5.0</a></li>
           <li><a href="<?cs var:toroot ?>security/enhancements/enhancements44.html">Android 4.4</a></li>