diff options
author | Joe Fernandez <joefernandez@google.com> | 2011-08-22 15:49:52 -0700 |
---|---|---|
committer | Joe Fernandez <joefernandez@google.com> | 2011-10-12 14:27:53 -0700 |
commit | 99b70f3f5d051261229d1792c169a374fc23326b (patch) | |
tree | 0632b5b5ed4cb4d860b6d59e02dfa87a726a7721 /docs/html/guide/appendix | |
parent | 8c7951afa28ffa08efe3c920db364788a0968f94 (diff) | |
download | frameworks_base-99b70f3f5d051261229d1792c169a374fc23326b.zip frameworks_base-99b70f3f5d051261229d1792c169a374fc23326b.tar.gz frameworks_base-99b70f3f5d051261229d1792c169a374fc23326b.tar.bz2 |
DO NOT MERGE
cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
Change-Id: Ia5150288ce6fe57460159dd7555c6786023b1d9e
Diffstat (limited to 'docs/html/guide/appendix')
-rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index ccc63a2..137f138 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -14,7 +14,7 @@ page.title=Android Supported Media Formats <h2>See also</h2> <ol> -<li><a href="{@docRoot}guide/topics/media/index.html">Audio and Video</a></li> +<li><a href="{@docRoot}guide/topics/media/index.html">Multimedia and Camera</a></li> </ol> <h2>Key classes</h2> |