Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22fa76da authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android (Google) Code Review
Browse files

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

parents c8cef6cc 2b86948e

docs/html/about/versions/android-5.0.jd

+3 −5
Original line number Diff line number Diff line
@@ -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>

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

+11 −0
Original line number Diff line number Diff line
@@ -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>