tree 9e6efa730f6809bd12f2bed0f686de6757ba5ffa
parent 10ffd8d6117e43d051b350f6542942bdf40992d7
parent 5daa25e710a695ab8c94b5a50bcdb465a7752dcc
author Roman Nurik <romannurik@google.com> 1301950278 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301950278 -0700

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

* commit '84967294f25d223ff2c5e62378b40f20fd853c4c':
  Document support for .TS video containers.