summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-11-19 10:47:10 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-19 10:47:10 -0800
commit0e29064d1caad7b82aa76876e7e2f4c86ded06d2 (patch)
treeba68731456d8a6b82115e5c27aac67cd4fc8f0e3
parent671a6ff4be11b3e2d8eb017e0c7a78e6133fb2b8 (diff)
parenta2587c4604297baad490bf50711a7be772a4e2e2 (diff)
downloadframeworks_base-0e29064d1caad7b82aa76876e7e2f4c86ded06d2.zip
frameworks_base-0e29064d1caad7b82aa76876e7e2f4c86ded06d2.tar.gz
frameworks_base-0e29064d1caad7b82aa76876e7e2f4c86ded06d2.tar.bz2
Merge "Doc change: update media formats table." into gingerbread
-rw-r--r--docs/html/guide/appendix/media-formats.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
index 94a6471..8709994 100644
--- a/docs/html/guide/appendix/media-formats.jd
+++ b/docs/html/guide/appendix/media-formats.jd
@@ -22,7 +22,7 @@ page.title=Android Supported Media Formats
<tr>
<td rowspan="9">Audio</td>
<td>AAC LC/LTP</td>
-<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
<td style="text-align: center;">X</td>
<td rowspan="3">Mono/Stereo content in any combination of standard bit rates up to 160 kbps and sampling rates from 8 to 48kHz</td>
<td rowspan="3">3GPP (.3gp) and MPEG-4 (.mp4, .m4a). No support for raw AAC (.aac)</td>
@@ -51,7 +51,7 @@ page.title=Android Supported Media Formats
<tr>
<td>AMR-WB</td>
-<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
<td style="text-align: center;">X</td>
<td>9 rates from 6.60 kbit/s to 23.85 kbit/s sampled @ 16kHz</td>
<td>3GPP (.3gp)</td>
@@ -109,7 +109,7 @@ page.title=Android Supported Media Formats
<tr>
<td>PNG</td>
-<td>&nbsp;</td>
+<td style="text-align: center;">X</td>
<td style="text-align: center;">X</td>
<td>&nbsp;</td>
<td>PNG (.png)</td>