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

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