tree c33b192e00e226495066be24aa9df36212378d72
parent eb47ddf8e410b2848e86e2be5ba442d82aa36362
parent 9d7b4c074205609271f61e1a4741ac0c524a1795
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