summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-10-11 12:27:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-11 12:27:13 -0700
commit439c4b4783ec9e800e9a6fd6fc38dd393c41b77b (patch)
treebc98804d92e98ba195d84f3c81d48ab53d86e1f4
parent0c74fc28b71df1a59bd6c94e62c1247ae922cff7 (diff)
parentc0da3f1d60f99c3188906d429ed38edbdd934f12 (diff)
downloadframeworks_base-439c4b4783ec9e800e9a6fd6fc38dd393c41b77b.zip
frameworks_base-439c4b4783ec9e800e9a6fd6fc38dd393c41b77b.tar.gz
frameworks_base-439c4b4783ec9e800e9a6fd6fc38dd393c41b77b.tar.bz2
am c0da3f1d: media-formats.html: clarify WebP availability
* commit 'c0da3f1d60f99c3188906d429ed38edbdd934f12': media-formats.html: clarify WebP availability
-rw-r--r--docs/html/guide/appendix/media-formats.jd14
1 files changed, 11 insertions, 3 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
index 9070968..7c6c145 100644
--- a/docs/html/guide/appendix/media-formats.jd
+++ b/docs/html/guide/appendix/media-formats.jd
@@ -217,9 +217,17 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td>
</tr>
<tr>
-<td>WEBP</td>
-<td style="text-align: center;" nowrap><big>&bull;</big><br><small>(Android 4.0+)</small></td>
-<td style="text-align: center;" nowrap><big>&bull;</big><br><small>(Android 4.0+)</small></td>
+<td>WebP</td>
+<td style="text-align: center;" nowrap>
+ <big>&bull;</big><br>
+ <small>(Android 4.0+)</small><br>
+ <small>(Lossless, Transparency, Android 4.2.1+)</small>
+</td>
+<td style="text-align: center;" nowrap>
+ <big>&bull;</big><br>
+ <small>(Android 4.0+)</small><br>
+ <small>(Lossless, Transparency, Android 4.2.1+)</small>
+</td>
<td>&nbsp;</td>
<td>
WebP (.webp)</td>