Doc change: edits to ICS MR1 API Overview.
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index 6ace709..7d119ca 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -87,14 +87,13 @@
<tr><td><a href="{@docRoot}sdk/android-4.0.3.html">Android 4.0.3</a></td>
<td><a href="{@docRoot}sdk/api_diff/15/changes.html" title="Diff Report">15</a></td>
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH_MR1}</td>
- <td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
+ <td rowspan="2"><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
Highlights</a></td></tr>
<tr><td><a href="{@docRoot}sdk/android-4.0.html">Android 4.0, 4.0.1, 4.0.2</a></td>
<td><a href="{@docRoot}sdk/api_diff/14/changes.html" title="Diff Report">14</a></td>
<td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}</td>
- <td><a href="{@docRoot}sdk/android-4.0-highlights.html">Platform
-Highlights</a></td></tr>
+ </tr>
<tr><td><a href="{@docRoot}sdk/android-3.2.html">Android 3.2</a></td>
<td><a href="{@docRoot}sdk/api_diff/13/changes.html" title="Diff Report">13</a></td>
diff --git a/docs/html/sdk/android-4.0.3.jd b/docs/html/sdk/android-4.0.3.jd
index 68257cd..c1ad120 100644
--- a/docs/html/sdk/android-4.0.3.jd
+++ b/docs/html/sdk/android-4.0.3.jd
@@ -20,7 +20,7 @@
<h2>Reference</h2>
<ol>
<li><a
-href="{@docRoot}sdk/api_diff/14/changes.html">API
+href="{@docRoot}sdk/api_diff/15/changes.html">API
Differences Report »</a> </li>
</ol>
@@ -72,9 +72,9 @@
<dl>
<dt>Initial release. SDK Tools r14 or higher is required.
<p class="caution"><strong>Important:</strong> To download the new Android
- 4.x system components from the Android SDK Manager, you must first update the
+ 4.0.x system components from the Android SDK Manager, you must first update the
SDK tools to revision 14 or later and restart the Android SDK Manager. If you do not,
- the Android 4.0 system components will not be available for download.</p>
+ the Android 4.0.x system components will not be available for download.</p>
</dt>
</dl>
@@ -224,7 +224,7 @@
<ul>
<li>New method {@link android.graphics.SurfaceTexture#setDefaultBufferSize(int
-width, int height)} in SurfaceTexture sets the default size of the image
+width, int height)} in {@link android.graphics.SurfaceTexture} sets the default size of the image
buffers. This method may be used to set the image size when producing images
with {@link android.graphics.Canvas} (via {@link
android.view.Surface#lockCanvas}), or OpenGL ES (via an EGLSurface).</li>
@@ -308,7 +308,7 @@
{@link android.media.CamcorderProfile#QUALITY_TIME_LAPSE_QVGA} constants.</li>
<li>New methods {@link android.hardware.Camera.Parameters#setVideoStabilization(boolean) setVideoStabilization()},
-{@link android.hardware.Camera.Parameters#getVideoStabilization() setVideoStabilization()}, and {android.hardware.Camera.Parameters#isVideoStabilizationSupported() isVideoStabilizationSupported()}
+{@link android.hardware.Camera.Parameters#getVideoStabilization() setVideoStabilization()}, and {@link android.hardware.Camera.Parameters#isVideoStabilizationSupported() isVideoStabilizationSupported()}
let you check and manage video stabilization for a {@link android.hardware.Camera}.</li>
</ul>