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

Commit 6e3276c1 authored by Joe Fernandez's avatar Joe Fernandez Committed by android-build-merger
Browse files

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

automerge: 287f2571

* commit '287f2571':
  docs: Add Android 5.1 to the uses-sdk manifest docs
parents 46d48f97 287f2571

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

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