diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-03-02 16:43:14 -0800 |
|---|---|---|
| committer | Joe Fernandez <joefernandez@google.com> | 2015-03-02 16:43:14 -0800 |
| commit | 2c25106ab490cbc52941270ac8944ac5f4c72631 (patch) | |
| tree | e13378eef3afb8b3d1a31f43d5fd052fcf461d10 /docs/html/guide/topics | |
| parent | bcced5b834e49bf3a0b57a0009958ba061d31e76 (diff) | |
| download | frameworks_base-2c25106ab490cbc52941270ac8944ac5f4c72631.zip frameworks_base-2c25106ab490cbc52941270ac8944ac5f4c72631.tar.gz frameworks_base-2c25106ab490cbc52941270ac8944ac5f4c72631.tar.bz2 | |
docs: Add Android 5.1 to the uses-sdk manifest docs
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
Diffstat (limited to 'docs/html/guide/topics')
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-sdk-element.jd | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index e5e64e5..3ac87ef 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -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> |