tree 3c83d92dffc667279a3ee973d292eb08bf9a7eaf
parent 31103928ed5b9091bcd7de74c8a49675d10c87e7
parent 7ed7668b30e70ca8e3f0f183364433326ed29f39
author James Dong <jdong@google.com> 1283478109 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283478109 -0700

am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread

Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
  Calculate audio media drift time from AudioSource