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

am aa1d2137: am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

Browse Source 
* commit 'aa1d21379020440f173b58a9edf32381a999f7bf':
  docs: Add Android 5.1 to the uses-sdk manifest docs
This commit is contained in:
Joe Fernandez
2015-03-03 01:32:41 +00:00
committed by Android Git Automerger
parent 882a7fd40e aa1d213790
commit 0c53910308
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,11 +227,16 @@ 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><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>
<td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td>
<td rowspan="2"><a href="{@docRoot}about/versions/lollipop.html">Platform
Highlights</a></td></tr>
<tr><td><a href="{@docRoot}about/versions/android-5.0.html">Android 5.0</a></td>
<td><a href="{@docRoot}sdk/api_diff/21/changes.html" title="Diff Report">21</a></td>
<td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td>
<td><a href="{@docRoot}about/versions/lollipop.html">Platform
Highlights</a></td></tr>
</tr>
<tr><td style="color:#bbb">Android 4.4W</td>
<td><a href="{@docRoot}sdk/api_diff/20/changes.html" title="Diff Report">20</a></td>