OSDN Git Service

am 732845c7: FastMixer computes presentation timestamps for fast tracks
authorGlenn Kasten <gkasten@google.com>
Tue, 3 Sep 2013 23:08:27 +0000 (16:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Sep 2013 23:08:27 +0000 (16:08 -0700)
* commit '732845c7e8d294bb1aaa4cd9687da62b51f1f6e6':
  FastMixer computes presentation timestamps for fast tracks


Trivial merge