tree 648d505ff6c073f02f18398abcef5949fc434fb0
parent c2c444f5a8e9d483c7a413d4050b305154690de6
parent 165ee4c53da462b1b6d131e25456dade51c18496
author Eric Laurent <elaurent@google.com> 1332171468 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332171468 -0700

am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1

* commit '165ee4c53da462b1b6d131e25456dade51c18496':
  audioflinger: fix issue with camcorder and A2DP