tree a398d0ab58e8063c0617f5e02453318500afe116
parent ec510fbdcd27705c293752d61d7ac94f1feda59c
parent e83bc2e31fb452b62cae43781fc53b5ab66b7c88
author James Dong <jdong@google.com> 1281997093 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281997093 -0700

am 4fc2c928: am b7208196: Use audio clock as the reference media clock

Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'

* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
  Use audio clock as the reference media clock