tree fb00fed26c01f844df309fc4064627b46757fe55
parent 41b35884ff68a62f5fc8f65dcc26342d0889113d
parent 54340961bd5865b7bfdb19e17621008abcd9130c
author Bruno Oliveira <btco@google.com> 1308699896 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308699896 -0700

Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2