diff options
| author | 2014-10-17 18:52:57 +0000 | |
|---|---|---|
| committer | 2014-10-17 18:52:57 +0000 | |
| commit | 20a7afd4b4fb0bc38ea3d4920f62e337c1011219 (patch) | |
| tree | 42b4b0593544220aa7b8ea24853372fd9370ea01 | |
| parent | 84b4ad4b20c8e9f2caab05df6716590c84dde595 (diff) | |
| parent | f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f (diff) | |
am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
* commit 'f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f':
Doc change: Add Lollipop to platform versions table.
| -rw-r--r-- | docs/html/about/versions/android-5.0.jd | 8 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-sdk-element.jd | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd index 2e3663b11fba..0ca921206492 100644 --- a/docs/html/about/versions/android-5.0.jd +++ b/docs/html/about/versions/android-5.0.jd @@ -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) »</a> </li> -<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">API -Differences Report (L Developer Preview to 21) »</a> </li> +<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 »</a> </li> +<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">L Developer Preview to 21 »</a> </li> </ol> </div> diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index 79a37f088f26..e5e64e547ecd 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -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> |