tree 4de3bb1f05ca9e334e886a102ff2623e71f0ca99
parent 85c4ee8533bcb172ad1805bf3daa9f9c95c831b3
parent 76fd1ea58835094e84d36f2353d1390c24d14bfc
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