diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-03-03 01:32:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 01:32:41 +0000 |
| commit | 0c53910308cb437d9b70395a492141181d943902 (patch) | |
| tree | 3b022daccafd6cd301661686265025950bbf6e27 /docs/html | |
| parent | 882a7fd40ed5704a59f49b4d97d9600a4e30db46 (diff) | |
| parent | aa1d21379020440f173b58a9edf32381a999f7bf (diff) | |
| download | frameworks_base-0c53910308cb437d9b70395a492141181d943902.zip frameworks_base-0c53910308cb437d9b70395a492141181d943902.tar.gz frameworks_base-0c53910308cb437d9b70395a492141181d943902.tar.bz2 | |
am aa1d2137: am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit 'aa1d21379020440f173b58a9edf32381a999f7bf':
docs: Add Android 5.1 to the uses-sdk manifest docs
Diffstat (limited to 'docs/html')
| -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> |