tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent f73bad5173a9b0d584bbd1c0ff555fb6c7835638
parent 5438c1d9443bbe621dd38f454f0152f8bbe29954
author Roman Nurik <romannurik@google.com> 1301949863 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301949863 -0700

am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1

* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
  Document support for .TS video containers.