tree 7d4fcbc13da9411b99b5048cca5fddfeba3c30a4
parent 85b1ba5dfb402b1acbfa516776d946769ccb8ffd
parent 4a4c728965b10df683d37b4b7ac27211e02006ad
author Jean-Michel Trivi <jmtrivi@google.com> 1351894827 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351894827 -0700

am 4a4c7289: Fix race condition when streaming MP2TS to media server

* commit '4a4c728965b10df683d37b4b7ac27211e02006ad':
  Fix race condition when streaming MP2TS to media server