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

* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
  audioflinger: fix audio skipping over A2DP
tree: dc2bd83e9c460d797eb66b98f2332a18e2e4f468
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/