tree 796c8bf29fb794b6c558b8cb845b06182cdc2fb8
parent 4c6c1f1d582a0aae24aa3ecef3fc1166513efba0
parent 8836f8e0bfc64dce81963db89dfc5d0f11c29483
author Jean-Baptiste Queru <jbq@google.com> 1346263104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346263104 -0700

am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"

* commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483':
  MPEG2TSWriter: Read more immediately if an empty buffer is received