tree 8771365c6443d15136ace93e8cdb984cee278316
parent 31b7c57a37e1c682591764e04f964112da65c74b
parent b1244f55fcc80d638e8c3d6791a41050ba1a600d
author Andreas Huber <andih@google.com> 1346776552 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346776552 -0700

am 76fd1ea5: am 7323115c: Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev

* commit '76fd1ea58835094e84d36f2353d1390c24d14bfc':
  Improvements to our MPEG2 Transport Stream parser