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

am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev

Browse Source 
* commit 'f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f':
  Doc change: Add Lollipop to platform versions table.
This commit is contained in:
Dirk Dougherty
2014-10-17 18:52:57 +00:00
committed by Android Git Automerger
parent 84b4ad4b20 f0c1af8e4b
commit 20a7afd4b4
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/html/about/versions/android-5.0.jd
View File

@@ -106,12 +106,10 @@ sdk.platform.apiLevel=21
</li>
</ol>
<h2>See also</h2>
<h2>API Differences</h2>
<ol>
<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API
Differences Report (API level 20 to 21) &raquo;</a> </li>
<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">API
Differences Report (L Developer Preview to 21) &raquo;</a> </li>
<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li>
<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">L Developer Preview to 21 &raquo;</a> </li>
</ol>
</div>

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

@@ -227,6 +227,17 @@ 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.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><td style="color:#bbb">Android 4.4W</td>
<td><a href="{@docRoot}sdk/api_diff/20/changes.html" title="Diff Report">20</a></td>
<td>{@link android.os.Build.VERSION_CODES#KITKAT_WATCH}</td>
<td style="color:#bbb">KitKat for Wearables Only</td></tr>
<tr><td><a href="{@docRoot}about/versions/android-4.4.html">Android 4.4</a></td>
<td><a href="{@docRoot}sdk/api_diff/19/changes.html" title="Diff Report">19</a></td>
<td>{@link android.os.Build.VERSION_CODES#KITKAT}</td>