tree 2fd6b826529c17c24066b7f2b86b0f3f07baf0fe
parent a52682416e89da1a5c086eee359f7c35cb126ea8
parent bd057752e8054ff516b9d2c17b70b666fc791559
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