tree edc8dffb9c5f9068b0d676372fad83018ddeaadb
parent f9737a890bbaff30268c8137e6375cfa249c3f1a
parent 14958e21c12f922d7501d32c3bec05109eb342d5
author Eric Laurent <elaurent@google.com> 1332171284 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332171284 -0700

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

* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP