diff options
| author | Joe Fernandez <joefernandez@google.com> | 2013-12-09 22:04:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-09 22:04:40 -0800 |
| commit | 1df855a4cd858363b4562febf00134017a5f833e (patch) | |
| tree | b017becfc547ec9294baad7fbee167f57bd50e28 /docs/html/guide | |
| parent | 50fe9a3a3c6a95c2b7fd02170ffa1b170908eeb3 (diff) | |
| parent | f31d915113234e35b43af72f35320f4cbad6e465 (diff) | |
| download | frameworks_base-1df855a4cd858363b4562febf00134017a5f833e.zip frameworks_base-1df855a4cd858363b4562febf00134017a5f833e.tar.gz frameworks_base-1df855a4cd858363b4562febf00134017a5f833e.tar.bz2 | |
am f31d9151: am cdac3b1e: Merge "docs: Platform image version release notes Android 4.4.2" into klp-docs
* commit 'f31d915113234e35b43af72f35320f4cbad6e465':
docs: Platform image version release notes Android 4.4.2
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-sdk-element.jd | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index 9169658..8de4739 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -273,55 +273,55 @@ Highlights</a>--></td></tr> <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR1}</td> <td><a href="{@docRoot}about/versions/android-3.1-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-3.0.html">Android 3.0.x</td> + <tr><td><a href="{@docRoot}about/versions/android-3.0.html">Android 3.0.x</a></td> <td><a href="{@docRoot}sdk/api_diff/11/changes.html" title="Diff Report">11</a></td> <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB}</td> <td><a href="{@docRoot}about/versions/android-3.0-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.3.3.html">Android 2.3.4<br>Android 2.3.3</td> + <tr><td><a href="{@docRoot}about/versions/android-2.3.3.html">Android 2.3.4<br>Android 2.3.3</a></td> <td><a href="{@docRoot}sdk/api_diff/10/changes.html" title="Diff Report">10</a></td> <td>{@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1}</td> <td rowspan="2"><a href="{@docRoot}about/versions/android-2.3-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.3.html">Android 2.3.2<br>Android 2.3.1<br>Android -2.3</td> + <tr><td><a href="{@docRoot}about/versions/android-2.3.html">Android 2.3.2<br>Android 2.3.1<br> + Android 2.3</a></td> <td><a href="{@docRoot}sdk/api_diff/9/changes.html" title="Diff Report">9</a></td> <td>{@link android.os.Build.VERSION_CODES#GINGERBREAD}</td> </tr> - <tr><td><a href="{@docRoot}about/versions/android-2.2.html">Android 2.2.x</td> + <tr><td><a href="{@docRoot}about/versions/android-2.2.html">Android 2.2.x</a></td> <td ><a href="{@docRoot}sdk/api_diff/8/changes.html" title="Diff Report">8</a></td> <td>{@link android.os.Build.VERSION_CODES#FROYO}</td> <td><a href="{@docRoot}about/versions/android-2.2-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.1.html">Android 2.1.x</td> + <tr><td><a href="{@docRoot}about/versions/android-2.1.html">Android 2.1.x</a></td> <td><a href="{@docRoot}sdk/api_diff/7/changes.html" title="Diff Report">7</a></td> <td>{@link android.os.Build.VERSION_CODES#ECLAIR_MR1}</td> <td rowspan="3" ><a href="{@docRoot}about/versions/android-2.0-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-2.0.1.html">Android 2.0.1</td> + <tr><td><a href="{@docRoot}about/versions/android-2.0.1.html">Android 2.0.1</a></td> <td><a href="{@docRoot}sdk/api_diff/6/changes.html" title="Diff Report">6</a></td> <td>{@link android.os.Build.VERSION_CODES#ECLAIR_0_1}</td> </tr> - <tr><td><a href="{@docRoot}about/versions/android-2.0.html">Android 2.0</td> + <tr><td><a href="{@docRoot}about/versions/android-2.0.html">Android 2.0</a></td> <td><a href="{@docRoot}sdk/api_diff/5/changes.html" title="Diff Report">5</a></td> <td>{@link android.os.Build.VERSION_CODES#ECLAIR}</td> </tr> - <tr><td><a href="{@docRoot}about/versions/android-1.6.html">Android 1.6</td> + <tr><td><a href="{@docRoot}about/versions/android-1.6.html">Android 1.6</a></td> <td><a href="{@docRoot}sdk/api_diff/4/changes.html" title="Diff Report">4</a></td> <td>{@link android.os.Build.VERSION_CODES#DONUT}</td> <td><a href="{@docRoot}about/versions/android-1.6-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-1.5.html">Android 1.5</td> + <tr><td><a href="{@docRoot}about/versions/android-1.5.html">Android 1.5</a></td> <td><a href="{@docRoot}sdk/api_diff/3/changes.html" title="Diff Report">3</a></td> <td>{@link android.os.Build.VERSION_CODES#CUPCAKE}</td> <td><a href="{@docRoot}about/versions/android-1.5-highlights.html">Platform Highlights</a></td></tr> - <tr><td><a href="{@docRoot}about/versions/android-1.1.html">Android 1.1</td> + <tr><td><a href="{@docRoot}about/versions/android-1.1.html">Android 1.1</a></td> <td>2</td> <td>{@link android.os.Build.VERSION_CODES#BASE_1_1}</td><td></td></tr> |