Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs

Browse Source 
am: 88e19d1

* commit '88e19d16708d0e2c5e2724bdc5c5cc8240ab46c5':
  docs: Fixed Marshmallow links in API level table.

Change-Id: Ia240a4aab036c56b9aa9def21a457f10f20ea614
This commit is contained in:
Kevin Hufnagle
2016-03-31 15:37:02 +00:00
committed by android-build-merger
parent f1cb86ccd8 88e19d1670
commit 2d9cc0f1a7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/html/guide/topics/manifest/uses-sdk-element.jd
View File

@@ -226,10 +226,10 @@ Versions dashboards page</a>.</p>
<table>
<tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>
<tr><td>Android 6.0</td>
<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>
<td><a href="{@docRoot}preview/api-overview.html">API Changes</a></td></tr>
<td><a href="{@docRoot}about/versions/marshmallow/index.html">Platform Highlights</a></td></tr>
<tr><td><a href="{@docRoot}about/versions/android-5.1.html">Android 5.1</a></td>
<td><a href="{@docRoot}sdk/api_diff/22/changes.html" title="Diff Report">22</a></td>