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

* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP
tree: 8e3233b2ef42a094d31d6eea8befbe8daceef9e5
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/