tree 92796232fc86de18eaeb0f0fbc85efe75efe7db8
parent 7016bf8e8741467428a64fd73a7036a60c67b5d7
parent 682d5593c9639090b3e08bd57570f3299df9da92
author Andreas Huber <andih@google.com> 1346349398 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346349398 -0700

am 682d5593: Merge "Optionally log the transport stream transmitted to the sink." into jb-mr1-dev

* commit '682d5593c9639090b3e08bd57570f3299df9da92':
  Optionally log the transport stream transmitted to the sink.