tree 7db009c66d5cc856ea1fb042a916a7b395972169
parent 1a733a33e1428f577747fcd74dccd8853bd1b29f
parent 9e603e057d6cc80e6b7e948b9af13b1a7b736008
author Eric Laurent <elaurent@google.com> 1323134578 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323134578 -0800

am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1

* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
  audioflinger: fix audio skipping over A2DP