tree e7d8f682ad7d5a17cc5338a0174e7339cacd97ad
parent f52faefce82ac4236f6a266fcfec0650c844421d
parent bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3
author James Dong <jdong@google.com> 1283478665 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283478665 -0700

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

Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'

* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
  Calculate audio media drift time from AudioSource