summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2016-07-27 22:47:58 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-07-27 22:47:59 +0000
commitffe63a4ad8050ac358a1dcea4174b3357dadce0b (patch)
treea00b963bb157ac3e0afe3e20f207249c07437871
parentcf150dd24548e49d6453beb76a6b245c5c91c390 (diff)
parent563c4f1adb829df50804a2347c87297c8fbac613 (diff)
Merge "docs: Added Android N (API level 24) to the "API levels" table" into nyc-dev
-rwxr-xr-xdocs/html/guide/topics/manifest/uses-sdk-element.jd7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index 94577ed53a2d..b8126c01ad48 100755
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -223,9 +223,14 @@ Android platform. For information about the relative numbers of devices that
are running each version, see the <a href="{@docRoot}about/dashboards/index.html">Platform
Versions dashboards page</a>.</p>
-<table>
+<table id="api-level-table">
<tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>
+ <tr><td><a href="{@docRoot}about/versions/nougat/android-7.0.html">Android 7.0</a></td>
+ <td><a href="{@docRoot}sdk/api_diff/24/changes.html" title="Diff Report">24</a></td>
+ <td>{@link android.os.Build.VERSION_CODES#N}</td>
+ <td><a href="{@docRoot}about/versions/nougat/index.html">Platform Highlights</a></td></tr>
+
<tr><td><a href="{@docRoot}about/versions/marshmallow/android-6.0.html">Android 6.0</a></td>
<td><a href="{@docRoot}sdk/api_diff/23/changes.html" title="Diff Report">23</a></td>
<td>{@link android.os.Build.VERSION_CODES#M}</td>