tree b12b930a75b06deeb67e4ee53ebc1773d7935ce0
parent 5501b48b787cafb1c2782f3df08bd3620cf1b31f
parent a5740924c0a71871f2697139effd43b137750597
author James Dong <jdong@google.com> 1280798148 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280798148 -0700

am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread

Merge commit '23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp

* commit '23796e3b622c6be4feb15d4d57e58645acfa431b':
  Add lost frame handling in AudioSource