am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2

* commit '0310f4dad3b6ab8b050f6072050dc80374abafc2':
  Rewriting "Audio and Video" section of Dev Guide.