Merge "Docs: Added ASL 23.2.1 Release Notes." into mnc-mr-docs
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 1ab1041..5472453 100755
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -553,12 +553,27 @@
<th>Comments</th>
</tr>
<tr>
- <td>Audio</td>
- <td><code>android.hardware.audio.low_latency</td>
+ <td rowspan="4">Audio</td>
+ <td><code>android.hardware.audio.low_latency</code></td>
<td>The application uses a low-latency audio pipeline on the device and
-is sensitive to delays or lag in sound input or output.</td>
-<td>
-</td>
+ is sensitive to delays or lag in sound input or output.</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>android.hardware.audio.pro</code></td>
+ <td>The application uses high-end audio functionality and performance.</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>android.hardware.microphone</code></td>
+ <td>The application records audio via a microphone.</td>
+ <td></td>
+ </tr>
+ </tr>
+ <td><code>android.hardware.output</code></td>
+ <td>The application produces at least one form of audio output, such as speakers, audio jack
+ or streaming over bluetooth.</td>
+ <td></td>
</tr>
<tr>
<td rowspan="2">Bluetooth</td>
@@ -944,6 +959,12 @@
support Live Wallpapers.</td>
</tr>
<tr>
+ <td>MIDI</td>
+ <td><code>android.software.midi</code></td>
+ <td>The application connects to musical instruments or outputs sound
+ using the Musical Instrument Digital Interface (MIDI) protocol.</td>
+</tr>
+<tr>
<td rowspan="2">SIP/VOIP</td>
<td><code>android.software.sip</code></td>
<td>The application uses SIP service on the device and should be installed only on devices that
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index 3fe51fe..72228a2 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -249,7 +249,8 @@
<p>After you back up your device data and download the system image below that
matches your device, follow the instructions at <a href=
-"https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
+"https://developers.google.com/android/nexus/images#instructions"
+>developers.google.com/android/nexus</a>
to flash the image onto your device.</p>
<p class="note">
@@ -336,7 +337,8 @@
<p>
If you want to uninstall the preview and revert the device to factory
specifications, go to
- <a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a>
+ <a href="http://developers.google.com/android/nexus/images"
+ >developers.google.com/android/nexus</a>
and download the image you want to flash to for your device. Follow the
instructions on that page to flash the image to your device.
</p>
diff --git a/docs/html/sdk/sdk_vars.cs b/docs/html/sdk/sdk_vars.cs
index 1a64ae5..cd01a64 100644
--- a/docs/html/sdk/sdk_vars.cs
+++ b/docs/html/sdk/sdk_vars.cs
@@ -40,17 +40,17 @@
set:ndk.mac64_download='android-ndk-r11-darwin-x86_64.zip' ?><?cs
-set:ndk.mac64_bytes='700461056' ?><?cs
-set:ndk.mac64_checksum='28fc96aa04e022a1629cc6e676460c96' ?><?cs
+set:ndk.mac64_bytes='774830876' ?><?cs
+set:ndk.mac64_checksum='7a6fdc0931ea9fe2713064f04474333369a34d53' ?><?cs
set:ndk.linux64_download='android-ndk-r11-linux-x86_64.zip' ?><?cs
-set:ndk.linux64_bytes='721313792' ?><?cs
-set:ndk.linux64_checksum='bd1175cbc59ed236835df8137d6efb57' ?><?cs
+set:ndk.linux64_bytes='796414803' ?><?cs
+set:ndk.linux64_checksum='8583ff5c22af1603129a6ec35afd3d51163e3fc1' ?><?cs
set:ndk.win64_download='android-ndk-r11-windows-x86_64.zip' ?><?cs
-set:ndk.win64_bytes='771297280' ?><?cs
-set:ndk.win64_checksum='c1fc239cceca31737d1dde778c970beb' ?><?cs
+set:ndk.win64_bytes='771291233' ?><?cs
+set:ndk.win64_checksum='49fcdae88724c74bb52b332b648edba9700b9529' ?><?cs
set:ndk.win32_download='android-ndk-r11-windows-x86.zip' ?><?cs
-set:ndk.win32_bytes='728780800' ?><?cs
-set:ndk.win32_checksum='b4456487fd354fc56800f96e38208ff4'
+set:ndk.win32_bytes='728773247' ?><?cs
+set:ndk.win32_checksum='0c9e895e400ab539c2005759410ef3e33d048291'
?>