commit 2b86948e46cfa92b27147d4b07ee0a96aa272cc3
author Dirk Dougherty <ddougherty@google.com> Fri Oct 17 02:16:58 2014 -0700
committer Dirk Dougherty <ddougherty@google.com> Fri Oct 17 02:16:58 2014 -0700
tree 745deb660917a149c5d3e03e325bcfbe81c6328a
parent 4561be01934cdc462570b56afb4c602cbf3295c4

Doc change: Add Lollipop to platform versions table.

Change-Id: Iad84444396a3b2d24403e88398ca21933741b819

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

diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd
index 2e3663b..0ca9212 100644
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd
@@ -106,12 +106,10 @@
   </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

diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index 79a37f0..e5e64e5 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 @@
 <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>