From 54340961bd5865b7bfdb19e17621008abcd9130c Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <btco@google.com>
Date: Tue, 7 Jun 2011 01:49:30 -0400
Subject: Rewriting "Audio and Video" section of Dev Guide.

Rewriting the "Audio and Video" section of the Dev Guide, renaming it
Media Framework and adding a more details about MediaPlayer,
interaction between MediaPlayer and services, Audio Focus, etc.

Staging:
http://www.corp.google.com/~btco/tmp/offline-sdk/guide/topics/media/index.html

This is a cherrypick of CL 106666 which was originally on honeycomb-mr1.
Link to old CL:
https://android-git.corp.google.com/g/#change,106666

Change-Id: I0efa4c9ed73af7f9dcb02232a6af4a7527645367
---
 docs/html/guide/guide_toc.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/html/guide/guide_toc.cs')

diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 916da0994d79..557e0944afb5 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -256,8 +256,8 @@
         </ul>
       </li>
       <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">
-            <span class="en">Audio and Video</span>
-          </a></li>
+            <span class="en">Media</span>
+          </a><span class="new">updated!</span></li>
       <li>
         <a href="<?cs var:toroot ?>guide/topics/clipboard/copy-paste.html">
             <span class="en">Copy and Paste</span>
-- 
cgit v1.2.3